diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/historyDoc/historyDoc-interface.ts b/src/views/resource/system/historyDoc/historyDoc-interface.ts
index b3ca8c3..45cc4ee 100644
--- a/src/views/resource/system/historyDoc/historyDoc-interface.ts
+++ b/src/views/resource/system/historyDoc/historyDoc-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   fileType: string // 文件类别
   fileNo: string // 文件编号
   fileName: string // 文件名

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/historyDoc/historyDoc-interface.ts b/src/views/resource/system/historyDoc/historyDoc-interface.ts
index b3ca8c3..45cc4ee 100644
--- a/src/views/resource/system/historyDoc/historyDoc-interface.ts
+++ b/src/views/resource/system/historyDoc/historyDoc-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   fileType: string // 文件类别
   fileNo: string // 文件编号
   fileName: string // 文件名
diff --git a/src/views/resource/system/historyDoc/list.vue b/src/views/resource/system/historyDoc/list.vue
index 3073b24..918c4c7 100644
--- a/src/views/resource/system/historyDoc/list.vue
+++ b/src/views/resource/system/historyDoc/list.vue
@@ -25,7 +25,7 @@
 // 查询条件
 const searchQuery = ref<IListQuery>({
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   fileType: '', // 文件类别
   fileNo: '', // 文件编号
   fileName: '', // 文件名
@@ -140,7 +140,7 @@
 const reset = () => {
   searchQuery.value = {
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     fileType: '', // 文件类别
     fileNo: '', // 文件编号
     fileName: '', // 文件名
@@ -204,7 +204,7 @@
   if (sysFileList.value.length > 0) {
     const params = {
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       fileType: searchQuery.value.fileType, // 文件类别
       fileNo: searchQuery.value.fileNo, // 文件编号
       fileName: searchQuery.value.fileName, // 文件名
@@ -378,7 +378,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/historyDoc/historyDoc-interface.ts b/src/views/resource/system/historyDoc/historyDoc-interface.ts
index b3ca8c3..45cc4ee 100644
--- a/src/views/resource/system/historyDoc/historyDoc-interface.ts
+++ b/src/views/resource/system/historyDoc/historyDoc-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   fileType: string // 文件类别
   fileNo: string // 文件编号
   fileName: string // 文件名
diff --git a/src/views/resource/system/historyDoc/list.vue b/src/views/resource/system/historyDoc/list.vue
index 3073b24..918c4c7 100644
--- a/src/views/resource/system/historyDoc/list.vue
+++ b/src/views/resource/system/historyDoc/list.vue
@@ -25,7 +25,7 @@
 // 查询条件
 const searchQuery = ref<IListQuery>({
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   fileType: '', // 文件类别
   fileNo: '', // 文件编号
   fileName: '', // 文件名
@@ -140,7 +140,7 @@
 const reset = () => {
   searchQuery.value = {
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     fileType: '', // 文件类别
     fileNo: '', // 文件编号
     fileName: '', // 文件名
@@ -204,7 +204,7 @@
   if (sysFileList.value.length > 0) {
     const params = {
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       fileType: searchQuery.value.fileType, // 文件类别
       fileNo: searchQuery.value.fileNo, // 文件编号
       fileName: searchQuery.value.fileName, // 文件名
@@ -378,7 +378,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/detail.vue b/src/views/resource/system/sysDoc/detail.vue
index 8385a94..2f49a49 100644
--- a/src/views/resource/system/sysDoc/detail.vue
+++ b/src/views/resource/system/sysDoc/detail.vue
@@ -64,13 +64,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/historyDoc/historyDoc-interface.ts b/src/views/resource/system/historyDoc/historyDoc-interface.ts
index b3ca8c3..45cc4ee 100644
--- a/src/views/resource/system/historyDoc/historyDoc-interface.ts
+++ b/src/views/resource/system/historyDoc/historyDoc-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   fileType: string // 文件类别
   fileNo: string // 文件编号
   fileName: string // 文件名
diff --git a/src/views/resource/system/historyDoc/list.vue b/src/views/resource/system/historyDoc/list.vue
index 3073b24..918c4c7 100644
--- a/src/views/resource/system/historyDoc/list.vue
+++ b/src/views/resource/system/historyDoc/list.vue
@@ -25,7 +25,7 @@
 // 查询条件
 const searchQuery = ref<IListQuery>({
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   fileType: '', // 文件类别
   fileNo: '', // 文件编号
   fileName: '', // 文件名
@@ -140,7 +140,7 @@
 const reset = () => {
   searchQuery.value = {
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     fileType: '', // 文件类别
     fileNo: '', // 文件编号
     fileName: '', // 文件名
@@ -204,7 +204,7 @@
   if (sysFileList.value.length > 0) {
     const params = {
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       fileType: searchQuery.value.fileType, // 文件类别
       fileNo: searchQuery.value.fileNo, // 文件编号
       fileName: searchQuery.value.fileName, // 文件名
@@ -378,7 +378,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/detail.vue b/src/views/resource/system/sysDoc/detail.vue
index 8385a94..2f49a49 100644
--- a/src/views/resource/system/sysDoc/detail.vue
+++ b/src/views/resource/system/sysDoc/detail.vue
@@ -64,13 +64,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/sysDoc/list.vue b/src/views/resource/system/sysDoc/list.vue
index 85dbf87..0966a3c 100644
--- a/src/views/resource/system/sysDoc/list.vue
+++ b/src/views/resource/system/sysDoc/list.vue
@@ -24,7 +24,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -132,7 +132,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
@@ -166,7 +166,7 @@
       fileType: searchQuery.value.fileType, // 文件类别
       history: '0', // 体系文件
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       effectiveDateStart: searchQuery.value.effectiveDateStart, // 实施时间开始
       effectiveDateEnd: searchQuery.value.effectiveDateEnd, // 实施时间结束
       promulgateTimeEnd: searchQuery.value.promulgateTimeEnd, // 颁布时间开始
@@ -343,7 +343,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/historyDoc/historyDoc-interface.ts b/src/views/resource/system/historyDoc/historyDoc-interface.ts
index b3ca8c3..45cc4ee 100644
--- a/src/views/resource/system/historyDoc/historyDoc-interface.ts
+++ b/src/views/resource/system/historyDoc/historyDoc-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   fileType: string // 文件类别
   fileNo: string // 文件编号
   fileName: string // 文件名
diff --git a/src/views/resource/system/historyDoc/list.vue b/src/views/resource/system/historyDoc/list.vue
index 3073b24..918c4c7 100644
--- a/src/views/resource/system/historyDoc/list.vue
+++ b/src/views/resource/system/historyDoc/list.vue
@@ -25,7 +25,7 @@
 // 查询条件
 const searchQuery = ref<IListQuery>({
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   fileType: '', // 文件类别
   fileNo: '', // 文件编号
   fileName: '', // 文件名
@@ -140,7 +140,7 @@
 const reset = () => {
   searchQuery.value = {
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     fileType: '', // 文件类别
     fileNo: '', // 文件编号
     fileName: '', // 文件名
@@ -204,7 +204,7 @@
   if (sysFileList.value.length > 0) {
     const params = {
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       fileType: searchQuery.value.fileType, // 文件类别
       fileNo: searchQuery.value.fileNo, // 文件编号
       fileName: searchQuery.value.fileName, // 文件名
@@ -378,7 +378,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/detail.vue b/src/views/resource/system/sysDoc/detail.vue
index 8385a94..2f49a49 100644
--- a/src/views/resource/system/sysDoc/detail.vue
+++ b/src/views/resource/system/sysDoc/detail.vue
@@ -64,13 +64,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/sysDoc/list.vue b/src/views/resource/system/sysDoc/list.vue
index 85dbf87..0966a3c 100644
--- a/src/views/resource/system/sysDoc/list.vue
+++ b/src/views/resource/system/sysDoc/list.vue
@@ -24,7 +24,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -132,7 +132,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
@@ -166,7 +166,7 @@
       fileType: searchQuery.value.fileType, // 文件类别
       history: '0', // 体系文件
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       effectiveDateStart: searchQuery.value.effectiveDateStart, // 实施时间开始
       effectiveDateEnd: searchQuery.value.effectiveDateEnd, // 实施时间结束
       promulgateTimeEnd: searchQuery.value.promulgateTimeEnd, // 颁布时间开始
@@ -343,7 +343,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/sysDoc-interface.ts b/src/views/resource/system/sysDoc/sysDoc-interface.ts
index 676859c..95662bc 100644
--- a/src/views/resource/system/sysDoc/sysDoc-interface.ts
+++ b/src/views/resource/system/sysDoc/sysDoc-interface.ts
@@ -10,7 +10,7 @@
   sort?: string
   order?: string
   labCode?: string // 实验室
-  groupCode?: string // 组别、部门
+  groupCode?: string // 部门、部门
   effectiveDateStart: string // 实施时间开始
   effectiveDateEnd: string // 实施时间结束
   promulgateTimeEnd: string // 颁布时间开始

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/historyDoc/historyDoc-interface.ts b/src/views/resource/system/historyDoc/historyDoc-interface.ts
index b3ca8c3..45cc4ee 100644
--- a/src/views/resource/system/historyDoc/historyDoc-interface.ts
+++ b/src/views/resource/system/historyDoc/historyDoc-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   fileType: string // 文件类别
   fileNo: string // 文件编号
   fileName: string // 文件名
diff --git a/src/views/resource/system/historyDoc/list.vue b/src/views/resource/system/historyDoc/list.vue
index 3073b24..918c4c7 100644
--- a/src/views/resource/system/historyDoc/list.vue
+++ b/src/views/resource/system/historyDoc/list.vue
@@ -25,7 +25,7 @@
 // 查询条件
 const searchQuery = ref<IListQuery>({
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   fileType: '', // 文件类别
   fileNo: '', // 文件编号
   fileName: '', // 文件名
@@ -140,7 +140,7 @@
 const reset = () => {
   searchQuery.value = {
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     fileType: '', // 文件类别
     fileNo: '', // 文件编号
     fileName: '', // 文件名
@@ -204,7 +204,7 @@
   if (sysFileList.value.length > 0) {
     const params = {
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       fileType: searchQuery.value.fileType, // 文件类别
       fileNo: searchQuery.value.fileNo, // 文件编号
       fileName: searchQuery.value.fileName, // 文件名
@@ -378,7 +378,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/detail.vue b/src/views/resource/system/sysDoc/detail.vue
index 8385a94..2f49a49 100644
--- a/src/views/resource/system/sysDoc/detail.vue
+++ b/src/views/resource/system/sysDoc/detail.vue
@@ -64,13 +64,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/sysDoc/list.vue b/src/views/resource/system/sysDoc/list.vue
index 85dbf87..0966a3c 100644
--- a/src/views/resource/system/sysDoc/list.vue
+++ b/src/views/resource/system/sysDoc/list.vue
@@ -24,7 +24,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -132,7 +132,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
@@ -166,7 +166,7 @@
       fileType: searchQuery.value.fileType, // 文件类别
       history: '0', // 体系文件
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       effectiveDateStart: searchQuery.value.effectiveDateStart, // 实施时间开始
       effectiveDateEnd: searchQuery.value.effectiveDateEnd, // 实施时间结束
       promulgateTimeEnd: searchQuery.value.promulgateTimeEnd, // 颁布时间开始
@@ -343,7 +343,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/sysDoc-interface.ts b/src/views/resource/system/sysDoc/sysDoc-interface.ts
index 676859c..95662bc 100644
--- a/src/views/resource/system/sysDoc/sysDoc-interface.ts
+++ b/src/views/resource/system/sysDoc/sysDoc-interface.ts
@@ -10,7 +10,7 @@
   sort?: string
   order?: string
   labCode?: string // 实验室
-  groupCode?: string // 组别、部门
+  groupCode?: string // 部门、部门
   effectiveDateStart: string // 实施时间开始
   effectiveDateEnd: string // 实施时间结束
   promulgateTimeEnd: string // 颁布时间开始
diff --git a/src/views/resource/technology/method/method-interface.ts b/src/views/resource/technology/method/method-interface.ts
index 3442454..a99178d 100644
--- a/src/views/resource/technology/method/method-interface.ts
+++ b/src/views/resource/technology/method/method-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室编号
-  groupCode: string // 组别编号（部门）
+  groupCode: string // 部门编号（部门）
   fileNo: string // 文件编号
   fileName: string // 文件名
   fileDistributeNo: string // 文件发放号

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/historyDoc/historyDoc-interface.ts b/src/views/resource/system/historyDoc/historyDoc-interface.ts
index b3ca8c3..45cc4ee 100644
--- a/src/views/resource/system/historyDoc/historyDoc-interface.ts
+++ b/src/views/resource/system/historyDoc/historyDoc-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   fileType: string // 文件类别
   fileNo: string // 文件编号
   fileName: string // 文件名
diff --git a/src/views/resource/system/historyDoc/list.vue b/src/views/resource/system/historyDoc/list.vue
index 3073b24..918c4c7 100644
--- a/src/views/resource/system/historyDoc/list.vue
+++ b/src/views/resource/system/historyDoc/list.vue
@@ -25,7 +25,7 @@
 // 查询条件
 const searchQuery = ref<IListQuery>({
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   fileType: '', // 文件类别
   fileNo: '', // 文件编号
   fileName: '', // 文件名
@@ -140,7 +140,7 @@
 const reset = () => {
   searchQuery.value = {
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     fileType: '', // 文件类别
     fileNo: '', // 文件编号
     fileName: '', // 文件名
@@ -204,7 +204,7 @@
   if (sysFileList.value.length > 0) {
     const params = {
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       fileType: searchQuery.value.fileType, // 文件类别
       fileNo: searchQuery.value.fileNo, // 文件编号
       fileName: searchQuery.value.fileName, // 文件名
@@ -378,7 +378,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/detail.vue b/src/views/resource/system/sysDoc/detail.vue
index 8385a94..2f49a49 100644
--- a/src/views/resource/system/sysDoc/detail.vue
+++ b/src/views/resource/system/sysDoc/detail.vue
@@ -64,13 +64,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/sysDoc/list.vue b/src/views/resource/system/sysDoc/list.vue
index 85dbf87..0966a3c 100644
--- a/src/views/resource/system/sysDoc/list.vue
+++ b/src/views/resource/system/sysDoc/list.vue
@@ -24,7 +24,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -132,7 +132,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
@@ -166,7 +166,7 @@
       fileType: searchQuery.value.fileType, // 文件类别
       history: '0', // 体系文件
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       effectiveDateStart: searchQuery.value.effectiveDateStart, // 实施时间开始
       effectiveDateEnd: searchQuery.value.effectiveDateEnd, // 实施时间结束
       promulgateTimeEnd: searchQuery.value.promulgateTimeEnd, // 颁布时间开始
@@ -343,7 +343,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/sysDoc-interface.ts b/src/views/resource/system/sysDoc/sysDoc-interface.ts
index 676859c..95662bc 100644
--- a/src/views/resource/system/sysDoc/sysDoc-interface.ts
+++ b/src/views/resource/system/sysDoc/sysDoc-interface.ts
@@ -10,7 +10,7 @@
   sort?: string
   order?: string
   labCode?: string // 实验室
-  groupCode?: string // 组别、部门
+  groupCode?: string // 部门、部门
   effectiveDateStart: string // 实施时间开始
   effectiveDateEnd: string // 实施时间结束
   promulgateTimeEnd: string // 颁布时间开始
diff --git a/src/views/resource/technology/method/method-interface.ts b/src/views/resource/technology/method/method-interface.ts
index 3442454..a99178d 100644
--- a/src/views/resource/technology/method/method-interface.ts
+++ b/src/views/resource/technology/method/method-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室编号
-  groupCode: string // 组别编号（部门）
+  groupCode: string // 部门编号（部门）
   fileNo: string // 文件编号
   fileName: string // 文件名
   fileDistributeNo: string // 文件发放号
diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue
index aed4b1b..41be211 100644
--- a/src/views/workbench/approve/list.vue
+++ b/src/views/workbench/approve/list.vue
@@ -14,7 +14,7 @@
 const messageSourceModuleList = ref<dictType[]>([]) // 来源模块
 const messageSourceModuleDict = ref({}) as any // 来源模块map
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const user = useUserStore() // 用户信息
@@ -199,14 +199,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
       }
       else { // 其他组

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/historyDoc/historyDoc-interface.ts b/src/views/resource/system/historyDoc/historyDoc-interface.ts
index b3ca8c3..45cc4ee 100644
--- a/src/views/resource/system/historyDoc/historyDoc-interface.ts
+++ b/src/views/resource/system/historyDoc/historyDoc-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   fileType: string // 文件类别
   fileNo: string // 文件编号
   fileName: string // 文件名
diff --git a/src/views/resource/system/historyDoc/list.vue b/src/views/resource/system/historyDoc/list.vue
index 3073b24..918c4c7 100644
--- a/src/views/resource/system/historyDoc/list.vue
+++ b/src/views/resource/system/historyDoc/list.vue
@@ -25,7 +25,7 @@
 // 查询条件
 const searchQuery = ref<IListQuery>({
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   fileType: '', // 文件类别
   fileNo: '', // 文件编号
   fileName: '', // 文件名
@@ -140,7 +140,7 @@
 const reset = () => {
   searchQuery.value = {
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     fileType: '', // 文件类别
     fileNo: '', // 文件编号
     fileName: '', // 文件名
@@ -204,7 +204,7 @@
   if (sysFileList.value.length > 0) {
     const params = {
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       fileType: searchQuery.value.fileType, // 文件类别
       fileNo: searchQuery.value.fileNo, // 文件编号
       fileName: searchQuery.value.fileName, // 文件名
@@ -378,7 +378,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/detail.vue b/src/views/resource/system/sysDoc/detail.vue
index 8385a94..2f49a49 100644
--- a/src/views/resource/system/sysDoc/detail.vue
+++ b/src/views/resource/system/sysDoc/detail.vue
@@ -64,13 +64,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/sysDoc/list.vue b/src/views/resource/system/sysDoc/list.vue
index 85dbf87..0966a3c 100644
--- a/src/views/resource/system/sysDoc/list.vue
+++ b/src/views/resource/system/sysDoc/list.vue
@@ -24,7 +24,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -132,7 +132,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
@@ -166,7 +166,7 @@
       fileType: searchQuery.value.fileType, // 文件类别
       history: '0', // 体系文件
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       effectiveDateStart: searchQuery.value.effectiveDateStart, // 实施时间开始
       effectiveDateEnd: searchQuery.value.effectiveDateEnd, // 实施时间结束
       promulgateTimeEnd: searchQuery.value.promulgateTimeEnd, // 颁布时间开始
@@ -343,7 +343,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/sysDoc-interface.ts b/src/views/resource/system/sysDoc/sysDoc-interface.ts
index 676859c..95662bc 100644
--- a/src/views/resource/system/sysDoc/sysDoc-interface.ts
+++ b/src/views/resource/system/sysDoc/sysDoc-interface.ts
@@ -10,7 +10,7 @@
   sort?: string
   order?: string
   labCode?: string // 实验室
-  groupCode?: string // 组别、部门
+  groupCode?: string // 部门、部门
   effectiveDateStart: string // 实施时间开始
   effectiveDateEnd: string // 实施时间结束
   promulgateTimeEnd: string // 颁布时间开始
diff --git a/src/views/resource/technology/method/method-interface.ts b/src/views/resource/technology/method/method-interface.ts
index 3442454..a99178d 100644
--- a/src/views/resource/technology/method/method-interface.ts
+++ b/src/views/resource/technology/method/method-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室编号
-  groupCode: string // 组别编号（部门）
+  groupCode: string // 部门编号（部门）
   fileNo: string // 文件编号
   fileName: string // 文件名
   fileDistributeNo: string // 文件发放号
diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue
index aed4b1b..41be211 100644
--- a/src/views/workbench/approve/list.vue
+++ b/src/views/workbench/approve/list.vue
@@ -14,7 +14,7 @@
 const messageSourceModuleList = ref<dictType[]>([]) // 来源模块
 const messageSourceModuleDict = ref({}) as any // 来源模块map
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const user = useUserStore() // 用户信息
@@ -199,14 +199,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
       }
       else { // 其他组
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index 814c8e7..29e56b9 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -11,7 +11,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const list = ref([]) as any // 表格数据
@@ -25,11 +25,11 @@
 const checkRecordTotalQuarter = ref('-') // 核查记录总数(本季度)
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -67,7 +67,7 @@
 const fetchCheckData = () => {
   getCheckData({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -105,7 +105,7 @@
     equipmentManufactureNo: '', // 被核查设备出厂编号
     recordNo: '', // 核查记录
     labCode: labCode.value, // 实验室
-    groupCode: groupCode.value, // 组别
+    groupCode: groupCode.value, // 部门
     limit: 999999,
     offset: 1,
   }).then((response) => {
@@ -121,7 +121,7 @@
 }
 
 // ----------------------------------------------钩子------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -143,14 +143,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -172,8 +172,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/historyDoc/historyDoc-interface.ts b/src/views/resource/system/historyDoc/historyDoc-interface.ts
index b3ca8c3..45cc4ee 100644
--- a/src/views/resource/system/historyDoc/historyDoc-interface.ts
+++ b/src/views/resource/system/historyDoc/historyDoc-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   fileType: string // 文件类别
   fileNo: string // 文件编号
   fileName: string // 文件名
diff --git a/src/views/resource/system/historyDoc/list.vue b/src/views/resource/system/historyDoc/list.vue
index 3073b24..918c4c7 100644
--- a/src/views/resource/system/historyDoc/list.vue
+++ b/src/views/resource/system/historyDoc/list.vue
@@ -25,7 +25,7 @@
 // 查询条件
 const searchQuery = ref<IListQuery>({
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   fileType: '', // 文件类别
   fileNo: '', // 文件编号
   fileName: '', // 文件名
@@ -140,7 +140,7 @@
 const reset = () => {
   searchQuery.value = {
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     fileType: '', // 文件类别
     fileNo: '', // 文件编号
     fileName: '', // 文件名
@@ -204,7 +204,7 @@
   if (sysFileList.value.length > 0) {
     const params = {
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       fileType: searchQuery.value.fileType, // 文件类别
       fileNo: searchQuery.value.fileNo, // 文件编号
       fileName: searchQuery.value.fileName, // 文件名
@@ -378,7 +378,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/detail.vue b/src/views/resource/system/sysDoc/detail.vue
index 8385a94..2f49a49 100644
--- a/src/views/resource/system/sysDoc/detail.vue
+++ b/src/views/resource/system/sysDoc/detail.vue
@@ -64,13 +64,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/sysDoc/list.vue b/src/views/resource/system/sysDoc/list.vue
index 85dbf87..0966a3c 100644
--- a/src/views/resource/system/sysDoc/list.vue
+++ b/src/views/resource/system/sysDoc/list.vue
@@ -24,7 +24,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -132,7 +132,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
@@ -166,7 +166,7 @@
       fileType: searchQuery.value.fileType, // 文件类别
       history: '0', // 体系文件
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       effectiveDateStart: searchQuery.value.effectiveDateStart, // 实施时间开始
       effectiveDateEnd: searchQuery.value.effectiveDateEnd, // 实施时间结束
       promulgateTimeEnd: searchQuery.value.promulgateTimeEnd, // 颁布时间开始
@@ -343,7 +343,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/sysDoc-interface.ts b/src/views/resource/system/sysDoc/sysDoc-interface.ts
index 676859c..95662bc 100644
--- a/src/views/resource/system/sysDoc/sysDoc-interface.ts
+++ b/src/views/resource/system/sysDoc/sysDoc-interface.ts
@@ -10,7 +10,7 @@
   sort?: string
   order?: string
   labCode?: string // 实验室
-  groupCode?: string // 组别、部门
+  groupCode?: string // 部门、部门
   effectiveDateStart: string // 实施时间开始
   effectiveDateEnd: string // 实施时间结束
   promulgateTimeEnd: string // 颁布时间开始
diff --git a/src/views/resource/technology/method/method-interface.ts b/src/views/resource/technology/method/method-interface.ts
index 3442454..a99178d 100644
--- a/src/views/resource/technology/method/method-interface.ts
+++ b/src/views/resource/technology/method/method-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室编号
-  groupCode: string // 组别编号（部门）
+  groupCode: string // 部门编号（部门）
   fileNo: string // 文件编号
   fileName: string // 文件名
   fileDistributeNo: string // 文件发放号
diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue
index aed4b1b..41be211 100644
--- a/src/views/workbench/approve/list.vue
+++ b/src/views/workbench/approve/list.vue
@@ -14,7 +14,7 @@
 const messageSourceModuleList = ref<dictType[]>([]) // 来源模块
 const messageSourceModuleDict = ref({}) as any // 来源模块map
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const user = useUserStore() // 用户信息
@@ -199,14 +199,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
       }
       else { // 其他组
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index 814c8e7..29e56b9 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -11,7 +11,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const list = ref([]) as any // 表格数据
@@ -25,11 +25,11 @@
 const checkRecordTotalQuarter = ref('-') // 核查记录总数(本季度)
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -67,7 +67,7 @@
 const fetchCheckData = () => {
   getCheckData({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -105,7 +105,7 @@
     equipmentManufactureNo: '', // 被核查设备出厂编号
     recordNo: '', // 核查记录
     labCode: labCode.value, // 实验室
-    groupCode: groupCode.value, // 组别
+    groupCode: groupCode.value, // 部门
     limit: 999999,
     offset: 1,
   }).then((response) => {
@@ -121,7 +121,7 @@
 }
 
 // ----------------------------------------------钩子------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -143,14 +143,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -172,8 +172,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/eqptManage.vue b/src/views/workbench/components/eqptManage.vue
index b3958a7..dadc6db 100644
--- a/src/views/workbench/components/eqptManage.vue
+++ b/src/views/workbench/components/eqptManage.vue
@@ -10,7 +10,7 @@
 const $router = useRouter()
 const loading = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const showEmpty = ref(false)
 const emptyDisc = ref('') // 描述文字
@@ -51,14 +51,14 @@
 ])
 const current = ref('') // 选择的tab 默认基本信息
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 /**
  * 获取字典
  */
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -98,7 +98,7 @@
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   offset: 1,
   limit: 99999999,
@@ -155,7 +155,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '0', // 是否为综合管理组人员1/0
   offset: 1,
@@ -181,7 +181,7 @@
   })
 }
 // --------------------------------------------钩子-------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -237,14 +237,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -267,8 +267,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/historyDoc/historyDoc-interface.ts b/src/views/resource/system/historyDoc/historyDoc-interface.ts
index b3ca8c3..45cc4ee 100644
--- a/src/views/resource/system/historyDoc/historyDoc-interface.ts
+++ b/src/views/resource/system/historyDoc/historyDoc-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   fileType: string // 文件类别
   fileNo: string // 文件编号
   fileName: string // 文件名
diff --git a/src/views/resource/system/historyDoc/list.vue b/src/views/resource/system/historyDoc/list.vue
index 3073b24..918c4c7 100644
--- a/src/views/resource/system/historyDoc/list.vue
+++ b/src/views/resource/system/historyDoc/list.vue
@@ -25,7 +25,7 @@
 // 查询条件
 const searchQuery = ref<IListQuery>({
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   fileType: '', // 文件类别
   fileNo: '', // 文件编号
   fileName: '', // 文件名
@@ -140,7 +140,7 @@
 const reset = () => {
   searchQuery.value = {
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     fileType: '', // 文件类别
     fileNo: '', // 文件编号
     fileName: '', // 文件名
@@ -204,7 +204,7 @@
   if (sysFileList.value.length > 0) {
     const params = {
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       fileType: searchQuery.value.fileType, // 文件类别
       fileNo: searchQuery.value.fileNo, // 文件编号
       fileName: searchQuery.value.fileName, // 文件名
@@ -378,7 +378,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/detail.vue b/src/views/resource/system/sysDoc/detail.vue
index 8385a94..2f49a49 100644
--- a/src/views/resource/system/sysDoc/detail.vue
+++ b/src/views/resource/system/sysDoc/detail.vue
@@ -64,13 +64,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/sysDoc/list.vue b/src/views/resource/system/sysDoc/list.vue
index 85dbf87..0966a3c 100644
--- a/src/views/resource/system/sysDoc/list.vue
+++ b/src/views/resource/system/sysDoc/list.vue
@@ -24,7 +24,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -132,7 +132,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
@@ -166,7 +166,7 @@
       fileType: searchQuery.value.fileType, // 文件类别
       history: '0', // 体系文件
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       effectiveDateStart: searchQuery.value.effectiveDateStart, // 实施时间开始
       effectiveDateEnd: searchQuery.value.effectiveDateEnd, // 实施时间结束
       promulgateTimeEnd: searchQuery.value.promulgateTimeEnd, // 颁布时间开始
@@ -343,7 +343,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/sysDoc-interface.ts b/src/views/resource/system/sysDoc/sysDoc-interface.ts
index 676859c..95662bc 100644
--- a/src/views/resource/system/sysDoc/sysDoc-interface.ts
+++ b/src/views/resource/system/sysDoc/sysDoc-interface.ts
@@ -10,7 +10,7 @@
   sort?: string
   order?: string
   labCode?: string // 实验室
-  groupCode?: string // 组别、部门
+  groupCode?: string // 部门、部门
   effectiveDateStart: string // 实施时间开始
   effectiveDateEnd: string // 实施时间结束
   promulgateTimeEnd: string // 颁布时间开始
diff --git a/src/views/resource/technology/method/method-interface.ts b/src/views/resource/technology/method/method-interface.ts
index 3442454..a99178d 100644
--- a/src/views/resource/technology/method/method-interface.ts
+++ b/src/views/resource/technology/method/method-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室编号
-  groupCode: string // 组别编号（部门）
+  groupCode: string // 部门编号（部门）
   fileNo: string // 文件编号
   fileName: string // 文件名
   fileDistributeNo: string // 文件发放号
diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue
index aed4b1b..41be211 100644
--- a/src/views/workbench/approve/list.vue
+++ b/src/views/workbench/approve/list.vue
@@ -14,7 +14,7 @@
 const messageSourceModuleList = ref<dictType[]>([]) // 来源模块
 const messageSourceModuleDict = ref({}) as any // 来源模块map
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const user = useUserStore() // 用户信息
@@ -199,14 +199,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
       }
       else { // 其他组
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index 814c8e7..29e56b9 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -11,7 +11,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const list = ref([]) as any // 表格数据
@@ -25,11 +25,11 @@
 const checkRecordTotalQuarter = ref('-') // 核查记录总数(本季度)
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -67,7 +67,7 @@
 const fetchCheckData = () => {
   getCheckData({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -105,7 +105,7 @@
     equipmentManufactureNo: '', // 被核查设备出厂编号
     recordNo: '', // 核查记录
     labCode: labCode.value, // 实验室
-    groupCode: groupCode.value, // 组别
+    groupCode: groupCode.value, // 部门
     limit: 999999,
     offset: 1,
   }).then((response) => {
@@ -121,7 +121,7 @@
 }
 
 // ----------------------------------------------钩子------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -143,14 +143,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -172,8 +172,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/eqptManage.vue b/src/views/workbench/components/eqptManage.vue
index b3958a7..dadc6db 100644
--- a/src/views/workbench/components/eqptManage.vue
+++ b/src/views/workbench/components/eqptManage.vue
@@ -10,7 +10,7 @@
 const $router = useRouter()
 const loading = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const showEmpty = ref(false)
 const emptyDisc = ref('') // 描述文字
@@ -51,14 +51,14 @@
 ])
 const current = ref('') // 选择的tab 默认基本信息
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 /**
  * 获取字典
  */
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -98,7 +98,7 @@
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   offset: 1,
   limit: 99999999,
@@ -155,7 +155,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '0', // 是否为综合管理组人员1/0
   offset: 1,
@@ -181,7 +181,7 @@
   })
 }
 // --------------------------------------------钩子-------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -237,14 +237,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -267,8 +267,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/equipmentManage.vue b/src/views/workbench/components/equipmentManage.vue
index f317dfc..8dd70c8 100644
--- a/src/views/workbench/components/equipmentManage.vue
+++ b/src/views/workbench/components/equipmentManage.vue
@@ -10,7 +10,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 
@@ -37,14 +37,14 @@
 const equipmentSourceAnalysisXData = ref([]) as any // x轴
 const equipmentSourceAnalysisData = ref([]) as any
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 /**
  * 获取字典
  */
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -76,7 +76,7 @@
 const fetchEquipmentStatus = () => {
   getEquipmentStatus({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -95,7 +95,7 @@
 const fetchEquipmentType = () => {
   getEquipmentType({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -115,7 +115,7 @@
 const fetchEquipmentTrace = () => {
   getEquipmentTrace({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -132,7 +132,7 @@
 const fetchExpireTrend = () => {
   getExpireTrend({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -164,7 +164,7 @@
 const fetchEquipmentCount = () => {
   getEquipmentCount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -185,7 +185,7 @@
   fetchEquipmentCount()
 }
 // --------------------------------------------钩子-------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -206,14 +206,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -235,8 +235,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 筛选框和设备总数 -->

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/historyDoc/historyDoc-interface.ts b/src/views/resource/system/historyDoc/historyDoc-interface.ts
index b3ca8c3..45cc4ee 100644
--- a/src/views/resource/system/historyDoc/historyDoc-interface.ts
+++ b/src/views/resource/system/historyDoc/historyDoc-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   fileType: string // 文件类别
   fileNo: string // 文件编号
   fileName: string // 文件名
diff --git a/src/views/resource/system/historyDoc/list.vue b/src/views/resource/system/historyDoc/list.vue
index 3073b24..918c4c7 100644
--- a/src/views/resource/system/historyDoc/list.vue
+++ b/src/views/resource/system/historyDoc/list.vue
@@ -25,7 +25,7 @@
 // 查询条件
 const searchQuery = ref<IListQuery>({
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   fileType: '', // 文件类别
   fileNo: '', // 文件编号
   fileName: '', // 文件名
@@ -140,7 +140,7 @@
 const reset = () => {
   searchQuery.value = {
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     fileType: '', // 文件类别
     fileNo: '', // 文件编号
     fileName: '', // 文件名
@@ -204,7 +204,7 @@
   if (sysFileList.value.length > 0) {
     const params = {
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       fileType: searchQuery.value.fileType, // 文件类别
       fileNo: searchQuery.value.fileNo, // 文件编号
       fileName: searchQuery.value.fileName, // 文件名
@@ -378,7 +378,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/detail.vue b/src/views/resource/system/sysDoc/detail.vue
index 8385a94..2f49a49 100644
--- a/src/views/resource/system/sysDoc/detail.vue
+++ b/src/views/resource/system/sysDoc/detail.vue
@@ -64,13 +64,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/sysDoc/list.vue b/src/views/resource/system/sysDoc/list.vue
index 85dbf87..0966a3c 100644
--- a/src/views/resource/system/sysDoc/list.vue
+++ b/src/views/resource/system/sysDoc/list.vue
@@ -24,7 +24,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -132,7 +132,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
@@ -166,7 +166,7 @@
       fileType: searchQuery.value.fileType, // 文件类别
       history: '0', // 体系文件
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       effectiveDateStart: searchQuery.value.effectiveDateStart, // 实施时间开始
       effectiveDateEnd: searchQuery.value.effectiveDateEnd, // 实施时间结束
       promulgateTimeEnd: searchQuery.value.promulgateTimeEnd, // 颁布时间开始
@@ -343,7 +343,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/sysDoc-interface.ts b/src/views/resource/system/sysDoc/sysDoc-interface.ts
index 676859c..95662bc 100644
--- a/src/views/resource/system/sysDoc/sysDoc-interface.ts
+++ b/src/views/resource/system/sysDoc/sysDoc-interface.ts
@@ -10,7 +10,7 @@
   sort?: string
   order?: string
   labCode?: string // 实验室
-  groupCode?: string // 组别、部门
+  groupCode?: string // 部门、部门
   effectiveDateStart: string // 实施时间开始
   effectiveDateEnd: string // 实施时间结束
   promulgateTimeEnd: string // 颁布时间开始
diff --git a/src/views/resource/technology/method/method-interface.ts b/src/views/resource/technology/method/method-interface.ts
index 3442454..a99178d 100644
--- a/src/views/resource/technology/method/method-interface.ts
+++ b/src/views/resource/technology/method/method-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室编号
-  groupCode: string // 组别编号（部门）
+  groupCode: string // 部门编号（部门）
   fileNo: string // 文件编号
   fileName: string // 文件名
   fileDistributeNo: string // 文件发放号
diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue
index aed4b1b..41be211 100644
--- a/src/views/workbench/approve/list.vue
+++ b/src/views/workbench/approve/list.vue
@@ -14,7 +14,7 @@
 const messageSourceModuleList = ref<dictType[]>([]) // 来源模块
 const messageSourceModuleDict = ref({}) as any // 来源模块map
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const user = useUserStore() // 用户信息
@@ -199,14 +199,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
       }
       else { // 其他组
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index 814c8e7..29e56b9 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -11,7 +11,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const list = ref([]) as any // 表格数据
@@ -25,11 +25,11 @@
 const checkRecordTotalQuarter = ref('-') // 核查记录总数(本季度)
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -67,7 +67,7 @@
 const fetchCheckData = () => {
   getCheckData({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -105,7 +105,7 @@
     equipmentManufactureNo: '', // 被核查设备出厂编号
     recordNo: '', // 核查记录
     labCode: labCode.value, // 实验室
-    groupCode: groupCode.value, // 组别
+    groupCode: groupCode.value, // 部门
     limit: 999999,
     offset: 1,
   }).then((response) => {
@@ -121,7 +121,7 @@
 }
 
 // ----------------------------------------------钩子------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -143,14 +143,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -172,8 +172,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/eqptManage.vue b/src/views/workbench/components/eqptManage.vue
index b3958a7..dadc6db 100644
--- a/src/views/workbench/components/eqptManage.vue
+++ b/src/views/workbench/components/eqptManage.vue
@@ -10,7 +10,7 @@
 const $router = useRouter()
 const loading = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const showEmpty = ref(false)
 const emptyDisc = ref('') // 描述文字
@@ -51,14 +51,14 @@
 ])
 const current = ref('') // 选择的tab 默认基本信息
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 /**
  * 获取字典
  */
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -98,7 +98,7 @@
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   offset: 1,
   limit: 99999999,
@@ -155,7 +155,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '0', // 是否为综合管理组人员1/0
   offset: 1,
@@ -181,7 +181,7 @@
   })
 }
 // --------------------------------------------钩子-------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -237,14 +237,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -267,8 +267,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/equipmentManage.vue b/src/views/workbench/components/equipmentManage.vue
index f317dfc..8dd70c8 100644
--- a/src/views/workbench/components/equipmentManage.vue
+++ b/src/views/workbench/components/equipmentManage.vue
@@ -10,7 +10,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 
@@ -37,14 +37,14 @@
 const equipmentSourceAnalysisXData = ref([]) as any // x轴
 const equipmentSourceAnalysisData = ref([]) as any
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 /**
  * 获取字典
  */
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -76,7 +76,7 @@
 const fetchEquipmentStatus = () => {
   getEquipmentStatus({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -95,7 +95,7 @@
 const fetchEquipmentType = () => {
   getEquipmentType({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -115,7 +115,7 @@
 const fetchEquipmentTrace = () => {
   getEquipmentTrace({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -132,7 +132,7 @@
 const fetchExpireTrend = () => {
   getExpireTrend({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -164,7 +164,7 @@
 const fetchEquipmentCount = () => {
   getEquipmentCount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -185,7 +185,7 @@
   fetchEquipmentCount()
 }
 // --------------------------------------------钩子-------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -206,14 +206,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -235,8 +235,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 筛选框和设备总数 -->
diff --git a/src/views/workbench/components/measureManage.vue b/src/views/workbench/components/measureManage.vue
index 6e74e8d..fa17ce3 100644
--- a/src/views/workbench/components/measureManage.vue
+++ b/src/views/workbench/components/measureManage.vue
@@ -11,7 +11,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 
@@ -26,11 +26,11 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -62,7 +62,7 @@
   // 设备类型分析
   getMeasureDevice({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -86,7 +86,7 @@
 const fetchMeasureConclusion = (startDate = '', endDate = '') => {
   getMeasureConclusion({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -109,7 +109,7 @@
 const fetchertAmount = () => {
   getCertAmount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -150,7 +150,7 @@
     fetchMeasureConclusion()
   }
 })
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -170,14 +170,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -199,8 +199,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/historyDoc/historyDoc-interface.ts b/src/views/resource/system/historyDoc/historyDoc-interface.ts
index b3ca8c3..45cc4ee 100644
--- a/src/views/resource/system/historyDoc/historyDoc-interface.ts
+++ b/src/views/resource/system/historyDoc/historyDoc-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   fileType: string // 文件类别
   fileNo: string // 文件编号
   fileName: string // 文件名
diff --git a/src/views/resource/system/historyDoc/list.vue b/src/views/resource/system/historyDoc/list.vue
index 3073b24..918c4c7 100644
--- a/src/views/resource/system/historyDoc/list.vue
+++ b/src/views/resource/system/historyDoc/list.vue
@@ -25,7 +25,7 @@
 // 查询条件
 const searchQuery = ref<IListQuery>({
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   fileType: '', // 文件类别
   fileNo: '', // 文件编号
   fileName: '', // 文件名
@@ -140,7 +140,7 @@
 const reset = () => {
   searchQuery.value = {
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     fileType: '', // 文件类别
     fileNo: '', // 文件编号
     fileName: '', // 文件名
@@ -204,7 +204,7 @@
   if (sysFileList.value.length > 0) {
     const params = {
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       fileType: searchQuery.value.fileType, // 文件类别
       fileNo: searchQuery.value.fileNo, // 文件编号
       fileName: searchQuery.value.fileName, // 文件名
@@ -378,7 +378,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/detail.vue b/src/views/resource/system/sysDoc/detail.vue
index 8385a94..2f49a49 100644
--- a/src/views/resource/system/sysDoc/detail.vue
+++ b/src/views/resource/system/sysDoc/detail.vue
@@ -64,13 +64,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/sysDoc/list.vue b/src/views/resource/system/sysDoc/list.vue
index 85dbf87..0966a3c 100644
--- a/src/views/resource/system/sysDoc/list.vue
+++ b/src/views/resource/system/sysDoc/list.vue
@@ -24,7 +24,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -132,7 +132,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
@@ -166,7 +166,7 @@
       fileType: searchQuery.value.fileType, // 文件类别
       history: '0', // 体系文件
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       effectiveDateStart: searchQuery.value.effectiveDateStart, // 实施时间开始
       effectiveDateEnd: searchQuery.value.effectiveDateEnd, // 实施时间结束
       promulgateTimeEnd: searchQuery.value.promulgateTimeEnd, // 颁布时间开始
@@ -343,7 +343,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/sysDoc-interface.ts b/src/views/resource/system/sysDoc/sysDoc-interface.ts
index 676859c..95662bc 100644
--- a/src/views/resource/system/sysDoc/sysDoc-interface.ts
+++ b/src/views/resource/system/sysDoc/sysDoc-interface.ts
@@ -10,7 +10,7 @@
   sort?: string
   order?: string
   labCode?: string // 实验室
-  groupCode?: string // 组别、部门
+  groupCode?: string // 部门、部门
   effectiveDateStart: string // 实施时间开始
   effectiveDateEnd: string // 实施时间结束
   promulgateTimeEnd: string // 颁布时间开始
diff --git a/src/views/resource/technology/method/method-interface.ts b/src/views/resource/technology/method/method-interface.ts
index 3442454..a99178d 100644
--- a/src/views/resource/technology/method/method-interface.ts
+++ b/src/views/resource/technology/method/method-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室编号
-  groupCode: string // 组别编号（部门）
+  groupCode: string // 部门编号（部门）
   fileNo: string // 文件编号
   fileName: string // 文件名
   fileDistributeNo: string // 文件发放号
diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue
index aed4b1b..41be211 100644
--- a/src/views/workbench/approve/list.vue
+++ b/src/views/workbench/approve/list.vue
@@ -14,7 +14,7 @@
 const messageSourceModuleList = ref<dictType[]>([]) // 来源模块
 const messageSourceModuleDict = ref({}) as any // 来源模块map
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const user = useUserStore() // 用户信息
@@ -199,14 +199,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
       }
       else { // 其他组
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index 814c8e7..29e56b9 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -11,7 +11,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const list = ref([]) as any // 表格数据
@@ -25,11 +25,11 @@
 const checkRecordTotalQuarter = ref('-') // 核查记录总数(本季度)
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -67,7 +67,7 @@
 const fetchCheckData = () => {
   getCheckData({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -105,7 +105,7 @@
     equipmentManufactureNo: '', // 被核查设备出厂编号
     recordNo: '', // 核查记录
     labCode: labCode.value, // 实验室
-    groupCode: groupCode.value, // 组别
+    groupCode: groupCode.value, // 部门
     limit: 999999,
     offset: 1,
   }).then((response) => {
@@ -121,7 +121,7 @@
 }
 
 // ----------------------------------------------钩子------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -143,14 +143,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -172,8 +172,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/eqptManage.vue b/src/views/workbench/components/eqptManage.vue
index b3958a7..dadc6db 100644
--- a/src/views/workbench/components/eqptManage.vue
+++ b/src/views/workbench/components/eqptManage.vue
@@ -10,7 +10,7 @@
 const $router = useRouter()
 const loading = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const showEmpty = ref(false)
 const emptyDisc = ref('') // 描述文字
@@ -51,14 +51,14 @@
 ])
 const current = ref('') // 选择的tab 默认基本信息
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 /**
  * 获取字典
  */
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -98,7 +98,7 @@
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   offset: 1,
   limit: 99999999,
@@ -155,7 +155,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '0', // 是否为综合管理组人员1/0
   offset: 1,
@@ -181,7 +181,7 @@
   })
 }
 // --------------------------------------------钩子-------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -237,14 +237,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -267,8 +267,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/equipmentManage.vue b/src/views/workbench/components/equipmentManage.vue
index f317dfc..8dd70c8 100644
--- a/src/views/workbench/components/equipmentManage.vue
+++ b/src/views/workbench/components/equipmentManage.vue
@@ -10,7 +10,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 
@@ -37,14 +37,14 @@
 const equipmentSourceAnalysisXData = ref([]) as any // x轴
 const equipmentSourceAnalysisData = ref([]) as any
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 /**
  * 获取字典
  */
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -76,7 +76,7 @@
 const fetchEquipmentStatus = () => {
   getEquipmentStatus({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -95,7 +95,7 @@
 const fetchEquipmentType = () => {
   getEquipmentType({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -115,7 +115,7 @@
 const fetchEquipmentTrace = () => {
   getEquipmentTrace({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -132,7 +132,7 @@
 const fetchExpireTrend = () => {
   getExpireTrend({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -164,7 +164,7 @@
 const fetchEquipmentCount = () => {
   getEquipmentCount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -185,7 +185,7 @@
   fetchEquipmentCount()
 }
 // --------------------------------------------钩子-------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -206,14 +206,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -235,8 +235,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 筛选框和设备总数 -->
diff --git a/src/views/workbench/components/measureManage.vue b/src/views/workbench/components/measureManage.vue
index 6e74e8d..fa17ce3 100644
--- a/src/views/workbench/components/measureManage.vue
+++ b/src/views/workbench/components/measureManage.vue
@@ -11,7 +11,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 
@@ -26,11 +26,11 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -62,7 +62,7 @@
   // 设备类型分析
   getMeasureDevice({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -86,7 +86,7 @@
 const fetchMeasureConclusion = (startDate = '', endDate = '') => {
   getMeasureConclusion({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -109,7 +109,7 @@
 const fetchertAmount = () => {
   getCertAmount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -150,7 +150,7 @@
     fetchMeasureConclusion()
   }
 })
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -170,14 +170,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -199,8 +199,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/noveltySearch.vue b/src/views/workbench/components/noveltySearch.vue
index ed96617..b1d8821 100644
--- a/src/views/workbench/components/noveltySearch.vue
+++ b/src/views/workbench/components/noveltySearch.vue
@@ -6,7 +6,7 @@
 import useUserStore from '@/store/modules/user'
 const user = useUserStore() // 用户信息
 const isAdministrator = ref('0') // 是不是超级管理员
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 const methodList = ref<any[]>([]) // 实验室
 const loading = ref(true)
@@ -41,7 +41,7 @@
   fetchData()
 })
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -118,9 +118,9 @@
     >
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 组别 -->
+    <!-- 部门 -->
     <el-select
-      v-model="query.groupCode" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="组别"
+      v-model="query.groupCode" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="部门"
       clearable @change="fetchData"
     >
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/historyDoc/historyDoc-interface.ts b/src/views/resource/system/historyDoc/historyDoc-interface.ts
index b3ca8c3..45cc4ee 100644
--- a/src/views/resource/system/historyDoc/historyDoc-interface.ts
+++ b/src/views/resource/system/historyDoc/historyDoc-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   fileType: string // 文件类别
   fileNo: string // 文件编号
   fileName: string // 文件名
diff --git a/src/views/resource/system/historyDoc/list.vue b/src/views/resource/system/historyDoc/list.vue
index 3073b24..918c4c7 100644
--- a/src/views/resource/system/historyDoc/list.vue
+++ b/src/views/resource/system/historyDoc/list.vue
@@ -25,7 +25,7 @@
 // 查询条件
 const searchQuery = ref<IListQuery>({
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   fileType: '', // 文件类别
   fileNo: '', // 文件编号
   fileName: '', // 文件名
@@ -140,7 +140,7 @@
 const reset = () => {
   searchQuery.value = {
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     fileType: '', // 文件类别
     fileNo: '', // 文件编号
     fileName: '', // 文件名
@@ -204,7 +204,7 @@
   if (sysFileList.value.length > 0) {
     const params = {
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       fileType: searchQuery.value.fileType, // 文件类别
       fileNo: searchQuery.value.fileNo, // 文件编号
       fileName: searchQuery.value.fileName, // 文件名
@@ -378,7 +378,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/detail.vue b/src/views/resource/system/sysDoc/detail.vue
index 8385a94..2f49a49 100644
--- a/src/views/resource/system/sysDoc/detail.vue
+++ b/src/views/resource/system/sysDoc/detail.vue
@@ -64,13 +64,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/sysDoc/list.vue b/src/views/resource/system/sysDoc/list.vue
index 85dbf87..0966a3c 100644
--- a/src/views/resource/system/sysDoc/list.vue
+++ b/src/views/resource/system/sysDoc/list.vue
@@ -24,7 +24,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -132,7 +132,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
@@ -166,7 +166,7 @@
       fileType: searchQuery.value.fileType, // 文件类别
       history: '0', // 体系文件
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       effectiveDateStart: searchQuery.value.effectiveDateStart, // 实施时间开始
       effectiveDateEnd: searchQuery.value.effectiveDateEnd, // 实施时间结束
       promulgateTimeEnd: searchQuery.value.promulgateTimeEnd, // 颁布时间开始
@@ -343,7 +343,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/sysDoc-interface.ts b/src/views/resource/system/sysDoc/sysDoc-interface.ts
index 676859c..95662bc 100644
--- a/src/views/resource/system/sysDoc/sysDoc-interface.ts
+++ b/src/views/resource/system/sysDoc/sysDoc-interface.ts
@@ -10,7 +10,7 @@
   sort?: string
   order?: string
   labCode?: string // 实验室
-  groupCode?: string // 组别、部门
+  groupCode?: string // 部门、部门
   effectiveDateStart: string // 实施时间开始
   effectiveDateEnd: string // 实施时间结束
   promulgateTimeEnd: string // 颁布时间开始
diff --git a/src/views/resource/technology/method/method-interface.ts b/src/views/resource/technology/method/method-interface.ts
index 3442454..a99178d 100644
--- a/src/views/resource/technology/method/method-interface.ts
+++ b/src/views/resource/technology/method/method-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室编号
-  groupCode: string // 组别编号（部门）
+  groupCode: string // 部门编号（部门）
   fileNo: string // 文件编号
   fileName: string // 文件名
   fileDistributeNo: string // 文件发放号
diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue
index aed4b1b..41be211 100644
--- a/src/views/workbench/approve/list.vue
+++ b/src/views/workbench/approve/list.vue
@@ -14,7 +14,7 @@
 const messageSourceModuleList = ref<dictType[]>([]) // 来源模块
 const messageSourceModuleDict = ref({}) as any // 来源模块map
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const user = useUserStore() // 用户信息
@@ -199,14 +199,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
       }
       else { // 其他组
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index 814c8e7..29e56b9 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -11,7 +11,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const list = ref([]) as any // 表格数据
@@ -25,11 +25,11 @@
 const checkRecordTotalQuarter = ref('-') // 核查记录总数(本季度)
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -67,7 +67,7 @@
 const fetchCheckData = () => {
   getCheckData({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -105,7 +105,7 @@
     equipmentManufactureNo: '', // 被核查设备出厂编号
     recordNo: '', // 核查记录
     labCode: labCode.value, // 实验室
-    groupCode: groupCode.value, // 组别
+    groupCode: groupCode.value, // 部门
     limit: 999999,
     offset: 1,
   }).then((response) => {
@@ -121,7 +121,7 @@
 }
 
 // ----------------------------------------------钩子------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -143,14 +143,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -172,8 +172,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/eqptManage.vue b/src/views/workbench/components/eqptManage.vue
index b3958a7..dadc6db 100644
--- a/src/views/workbench/components/eqptManage.vue
+++ b/src/views/workbench/components/eqptManage.vue
@@ -10,7 +10,7 @@
 const $router = useRouter()
 const loading = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const showEmpty = ref(false)
 const emptyDisc = ref('') // 描述文字
@@ -51,14 +51,14 @@
 ])
 const current = ref('') // 选择的tab 默认基本信息
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 /**
  * 获取字典
  */
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -98,7 +98,7 @@
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   offset: 1,
   limit: 99999999,
@@ -155,7 +155,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '0', // 是否为综合管理组人员1/0
   offset: 1,
@@ -181,7 +181,7 @@
   })
 }
 // --------------------------------------------钩子-------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -237,14 +237,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -267,8 +267,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/equipmentManage.vue b/src/views/workbench/components/equipmentManage.vue
index f317dfc..8dd70c8 100644
--- a/src/views/workbench/components/equipmentManage.vue
+++ b/src/views/workbench/components/equipmentManage.vue
@@ -10,7 +10,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 
@@ -37,14 +37,14 @@
 const equipmentSourceAnalysisXData = ref([]) as any // x轴
 const equipmentSourceAnalysisData = ref([]) as any
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 /**
  * 获取字典
  */
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -76,7 +76,7 @@
 const fetchEquipmentStatus = () => {
   getEquipmentStatus({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -95,7 +95,7 @@
 const fetchEquipmentType = () => {
   getEquipmentType({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -115,7 +115,7 @@
 const fetchEquipmentTrace = () => {
   getEquipmentTrace({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -132,7 +132,7 @@
 const fetchExpireTrend = () => {
   getExpireTrend({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -164,7 +164,7 @@
 const fetchEquipmentCount = () => {
   getEquipmentCount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -185,7 +185,7 @@
   fetchEquipmentCount()
 }
 // --------------------------------------------钩子-------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -206,14 +206,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -235,8 +235,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 筛选框和设备总数 -->
diff --git a/src/views/workbench/components/measureManage.vue b/src/views/workbench/components/measureManage.vue
index 6e74e8d..fa17ce3 100644
--- a/src/views/workbench/components/measureManage.vue
+++ b/src/views/workbench/components/measureManage.vue
@@ -11,7 +11,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 
@@ -26,11 +26,11 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -62,7 +62,7 @@
   // 设备类型分析
   getMeasureDevice({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -86,7 +86,7 @@
 const fetchMeasureConclusion = (startDate = '', endDate = '') => {
   getMeasureConclusion({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -109,7 +109,7 @@
 const fetchertAmount = () => {
   getCertAmount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -150,7 +150,7 @@
     fetchMeasureConclusion()
   }
 })
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -170,14 +170,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -199,8 +199,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/noveltySearch.vue b/src/views/workbench/components/noveltySearch.vue
index ed96617..b1d8821 100644
--- a/src/views/workbench/components/noveltySearch.vue
+++ b/src/views/workbench/components/noveltySearch.vue
@@ -6,7 +6,7 @@
 import useUserStore from '@/store/modules/user'
 const user = useUserStore() // 用户信息
 const isAdministrator = ref('0') // 是不是超级管理员
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 const methodList = ref<any[]>([]) // 实验室
 const loading = ref(true)
@@ -41,7 +41,7 @@
   fetchData()
 })
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -118,9 +118,9 @@
     >
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 组别 -->
+    <!-- 部门 -->
     <el-select
-      v-model="query.groupCode" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="组别"
+      v-model="query.groupCode" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="部门"
       clearable @change="fetchData"
     >
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
diff --git a/src/views/workbench/components/step.vue b/src/views/workbench/components/step.vue
index 87ef585..45a0c54 100644
--- a/src/views/workbench/components/step.vue
+++ b/src/views/workbench/components/step.vue
@@ -14,18 +14,18 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 // 内部审核进度
 const scheduleList = ref([]) as any
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -160,7 +160,7 @@
   fetchRegistrationList()
 }
 
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -180,14 +180,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -225,8 +225,8 @@
         >
           <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
-        <!-- 综合管理组才可以筛选组别 -->
-        <!-- <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+        <!-- 综合管理组才可以筛选部门 -->
+        <!-- <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
         <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select> -->
       </div>

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/historyDoc/historyDoc-interface.ts b/src/views/resource/system/historyDoc/historyDoc-interface.ts
index b3ca8c3..45cc4ee 100644
--- a/src/views/resource/system/historyDoc/historyDoc-interface.ts
+++ b/src/views/resource/system/historyDoc/historyDoc-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   fileType: string // 文件类别
   fileNo: string // 文件编号
   fileName: string // 文件名
diff --git a/src/views/resource/system/historyDoc/list.vue b/src/views/resource/system/historyDoc/list.vue
index 3073b24..918c4c7 100644
--- a/src/views/resource/system/historyDoc/list.vue
+++ b/src/views/resource/system/historyDoc/list.vue
@@ -25,7 +25,7 @@
 // 查询条件
 const searchQuery = ref<IListQuery>({
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   fileType: '', // 文件类别
   fileNo: '', // 文件编号
   fileName: '', // 文件名
@@ -140,7 +140,7 @@
 const reset = () => {
   searchQuery.value = {
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     fileType: '', // 文件类别
     fileNo: '', // 文件编号
     fileName: '', // 文件名
@@ -204,7 +204,7 @@
   if (sysFileList.value.length > 0) {
     const params = {
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       fileType: searchQuery.value.fileType, // 文件类别
       fileNo: searchQuery.value.fileNo, // 文件编号
       fileName: searchQuery.value.fileName, // 文件名
@@ -378,7 +378,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/detail.vue b/src/views/resource/system/sysDoc/detail.vue
index 8385a94..2f49a49 100644
--- a/src/views/resource/system/sysDoc/detail.vue
+++ b/src/views/resource/system/sysDoc/detail.vue
@@ -64,13 +64,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/sysDoc/list.vue b/src/views/resource/system/sysDoc/list.vue
index 85dbf87..0966a3c 100644
--- a/src/views/resource/system/sysDoc/list.vue
+++ b/src/views/resource/system/sysDoc/list.vue
@@ -24,7 +24,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -132,7 +132,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
@@ -166,7 +166,7 @@
       fileType: searchQuery.value.fileType, // 文件类别
       history: '0', // 体系文件
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       effectiveDateStart: searchQuery.value.effectiveDateStart, // 实施时间开始
       effectiveDateEnd: searchQuery.value.effectiveDateEnd, // 实施时间结束
       promulgateTimeEnd: searchQuery.value.promulgateTimeEnd, // 颁布时间开始
@@ -343,7 +343,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/sysDoc-interface.ts b/src/views/resource/system/sysDoc/sysDoc-interface.ts
index 676859c..95662bc 100644
--- a/src/views/resource/system/sysDoc/sysDoc-interface.ts
+++ b/src/views/resource/system/sysDoc/sysDoc-interface.ts
@@ -10,7 +10,7 @@
   sort?: string
   order?: string
   labCode?: string // 实验室
-  groupCode?: string // 组别、部门
+  groupCode?: string // 部门、部门
   effectiveDateStart: string // 实施时间开始
   effectiveDateEnd: string // 实施时间结束
   promulgateTimeEnd: string // 颁布时间开始
diff --git a/src/views/resource/technology/method/method-interface.ts b/src/views/resource/technology/method/method-interface.ts
index 3442454..a99178d 100644
--- a/src/views/resource/technology/method/method-interface.ts
+++ b/src/views/resource/technology/method/method-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室编号
-  groupCode: string // 组别编号（部门）
+  groupCode: string // 部门编号（部门）
   fileNo: string // 文件编号
   fileName: string // 文件名
   fileDistributeNo: string // 文件发放号
diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue
index aed4b1b..41be211 100644
--- a/src/views/workbench/approve/list.vue
+++ b/src/views/workbench/approve/list.vue
@@ -14,7 +14,7 @@
 const messageSourceModuleList = ref<dictType[]>([]) // 来源模块
 const messageSourceModuleDict = ref({}) as any // 来源模块map
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const user = useUserStore() // 用户信息
@@ -199,14 +199,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
       }
       else { // 其他组
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index 814c8e7..29e56b9 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -11,7 +11,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const list = ref([]) as any // 表格数据
@@ -25,11 +25,11 @@
 const checkRecordTotalQuarter = ref('-') // 核查记录总数(本季度)
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -67,7 +67,7 @@
 const fetchCheckData = () => {
   getCheckData({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -105,7 +105,7 @@
     equipmentManufactureNo: '', // 被核查设备出厂编号
     recordNo: '', // 核查记录
     labCode: labCode.value, // 实验室
-    groupCode: groupCode.value, // 组别
+    groupCode: groupCode.value, // 部门
     limit: 999999,
     offset: 1,
   }).then((response) => {
@@ -121,7 +121,7 @@
 }
 
 // ----------------------------------------------钩子------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -143,14 +143,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -172,8 +172,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/eqptManage.vue b/src/views/workbench/components/eqptManage.vue
index b3958a7..dadc6db 100644
--- a/src/views/workbench/components/eqptManage.vue
+++ b/src/views/workbench/components/eqptManage.vue
@@ -10,7 +10,7 @@
 const $router = useRouter()
 const loading = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const showEmpty = ref(false)
 const emptyDisc = ref('') // 描述文字
@@ -51,14 +51,14 @@
 ])
 const current = ref('') // 选择的tab 默认基本信息
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 /**
  * 获取字典
  */
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -98,7 +98,7 @@
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   offset: 1,
   limit: 99999999,
@@ -155,7 +155,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '0', // 是否为综合管理组人员1/0
   offset: 1,
@@ -181,7 +181,7 @@
   })
 }
 // --------------------------------------------钩子-------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -237,14 +237,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -267,8 +267,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/equipmentManage.vue b/src/views/workbench/components/equipmentManage.vue
index f317dfc..8dd70c8 100644
--- a/src/views/workbench/components/equipmentManage.vue
+++ b/src/views/workbench/components/equipmentManage.vue
@@ -10,7 +10,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 
@@ -37,14 +37,14 @@
 const equipmentSourceAnalysisXData = ref([]) as any // x轴
 const equipmentSourceAnalysisData = ref([]) as any
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 /**
  * 获取字典
  */
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -76,7 +76,7 @@
 const fetchEquipmentStatus = () => {
   getEquipmentStatus({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -95,7 +95,7 @@
 const fetchEquipmentType = () => {
   getEquipmentType({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -115,7 +115,7 @@
 const fetchEquipmentTrace = () => {
   getEquipmentTrace({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -132,7 +132,7 @@
 const fetchExpireTrend = () => {
   getExpireTrend({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -164,7 +164,7 @@
 const fetchEquipmentCount = () => {
   getEquipmentCount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -185,7 +185,7 @@
   fetchEquipmentCount()
 }
 // --------------------------------------------钩子-------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -206,14 +206,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -235,8 +235,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 筛选框和设备总数 -->
diff --git a/src/views/workbench/components/measureManage.vue b/src/views/workbench/components/measureManage.vue
index 6e74e8d..fa17ce3 100644
--- a/src/views/workbench/components/measureManage.vue
+++ b/src/views/workbench/components/measureManage.vue
@@ -11,7 +11,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 
@@ -26,11 +26,11 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -62,7 +62,7 @@
   // 设备类型分析
   getMeasureDevice({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -86,7 +86,7 @@
 const fetchMeasureConclusion = (startDate = '', endDate = '') => {
   getMeasureConclusion({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -109,7 +109,7 @@
 const fetchertAmount = () => {
   getCertAmount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -150,7 +150,7 @@
     fetchMeasureConclusion()
   }
 })
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -170,14 +170,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -199,8 +199,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/noveltySearch.vue b/src/views/workbench/components/noveltySearch.vue
index ed96617..b1d8821 100644
--- a/src/views/workbench/components/noveltySearch.vue
+++ b/src/views/workbench/components/noveltySearch.vue
@@ -6,7 +6,7 @@
 import useUserStore from '@/store/modules/user'
 const user = useUserStore() // 用户信息
 const isAdministrator = ref('0') // 是不是超级管理员
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 const methodList = ref<any[]>([]) // 实验室
 const loading = ref(true)
@@ -41,7 +41,7 @@
   fetchData()
 })
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -118,9 +118,9 @@
     >
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 组别 -->
+    <!-- 部门 -->
     <el-select
-      v-model="query.groupCode" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="组别"
+      v-model="query.groupCode" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="部门"
       clearable @change="fetchData"
     >
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
diff --git a/src/views/workbench/components/step.vue b/src/views/workbench/components/step.vue
index 87ef585..45a0c54 100644
--- a/src/views/workbench/components/step.vue
+++ b/src/views/workbench/components/step.vue
@@ -14,18 +14,18 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 // 内部审核进度
 const scheduleList = ref([]) as any
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -160,7 +160,7 @@
   fetchRegistrationList()
 }
 
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -180,14 +180,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -225,8 +225,8 @@
         >
           <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
-        <!-- 综合管理组才可以筛选组别 -->
-        <!-- <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+        <!-- 综合管理组才可以筛选部门 -->
+        <!-- <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
         <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select> -->
       </div>
diff --git a/src/views/workbench/components/tableList.vue b/src/views/workbench/components/tableList.vue
index 9a383b3..99ef2d7 100644
--- a/src/views/workbench/components/tableList.vue
+++ b/src/views/workbench/components/tableList.vue
@@ -14,7 +14,7 @@
   },
 })
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('暂无数据') // 描述文字
 const user = useUserStore() // 用户信息
@@ -106,8 +106,8 @@
     else { // 不聚合直接跳详情
       updateWorkStatus(row) // 标记：未读 -> 已读
       const name = row.messageTopic
-      if (name === '周维护提醒' || name === '月保养提醒' || name === '标准装置核查提醒' ||
-        name.includes('周维护') || name.includes('月保养')
+      if (name === '周维护提醒' || name === '月保养提醒' || name === '标准装置核查提醒'
+        || name.includes('周维护') || name.includes('月保养')
       ) {
         $router.push({
           path: `${WORKPATHS[name]}`,
@@ -161,14 +161,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
       }
       else { // 其他组

diff --git a/src/api/equipment/info/book.ts b/src/api/equipment/info/book.ts
index 60cf0d2..295d4f9 100644
--- a/src/api/equipment/info/book.ts
+++ b/src/api/equipment/info/book.ts
@@ -9,7 +9,7 @@
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -18,7 +18,7 @@
   return request({
     url: `${prefix}/save`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -27,7 +27,7 @@
   return request({
     url: `${prefix}/draftUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 // 编辑
@@ -35,7 +35,7 @@
   return request({
     url: `${prefix}/failUpdate`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -44,7 +44,7 @@
   return request({
     url: `${prefix}/detail`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -59,7 +59,7 @@
   return request({
     url: `${prefix}/submit`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -68,7 +68,7 @@
   return request({
     url: `${prefix}/draftDelete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -77,7 +77,7 @@
   return request({
     url: `${prefix}/approval/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -86,7 +86,7 @@
   return request({
     url: `${prefix}/circulationLog/listPage`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -99,7 +99,7 @@
   return request({
     url: `${prefix}/status/log/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -112,7 +112,7 @@
   return request({
     url: `${prefix}/approval/revoke`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -125,7 +125,7 @@
   return request({
     url: `${prefix}/approval/refuse`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -134,7 +134,7 @@
   return request({
     url: `${prefix}/remind`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -143,11 +143,11 @@
   return request({
     url: `${prefix}/import`,
     method: 'post',
-    data
+    data,
   })
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 export function getDeptIdByLabAndGroup(params: {
   labCode: string
   groupNo: string
@@ -155,7 +155,7 @@
   return request({
     url: '/system/getDeptIdByLabAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -164,7 +164,7 @@
   return request({
     url: `${path}?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -173,7 +173,7 @@
   return request({
     url: '/equipment/certificate/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -182,7 +182,7 @@
   return request({
     url: '/equipment/detail/maintain/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -191,7 +191,7 @@
   return request({
     url: '/equipment/detail/resume/listPage',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -200,7 +200,7 @@
   return request({
     url: '/equipment/hasChanged',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -210,7 +210,7 @@
     url: '/equipment/exportFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
 
@@ -220,6 +220,6 @@
     url: '/equipment/exportExcelFile',
     method: 'post',
     responseType: 'blob',
-    data
+    data,
   })
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 5678997..ff2d6d5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -10,7 +10,7 @@
   return request({
     url: `${prefix}mgr/list`,
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -19,14 +19,14 @@
   return request({
     url: '/system/mgr/list',
     method: 'get',
-    params
+    params,
   })
 }
 
 //  获取用户所在单位
 export function getUserDept() {
   return request({
-    url: '/system/company'
+    url: '/system/company',
   })
 }
 
@@ -43,7 +43,7 @@
   return request({
     url: `${prefix}mgr/delete`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -52,7 +52,7 @@
   return request({
     url: `${prefix}mgr/freeze`,
     method: 'post',
-    data
+    data,
   })
 }
 // 冻结用户
@@ -60,7 +60,7 @@
   return request({
     url: `${prefix}mgr/unfreeze`,
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -69,7 +69,7 @@
   return request({
     url: 'sys/mgr/reset',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -80,17 +80,17 @@
     method: 'post',
     data: {
       userId,
-      roleIds: ids
-    }
+      roleIds: ids,
+    },
     // paramsSerializer: (params) => qs.stringify(params, { indices: false })
   })
 }
 
-// 获取用户实验室代码和组别
+// 获取用户实验室代码和部门
 export function getLabAndGroup(params: { deptId: string }) {
   return request({
     url: '/system/labAndGroup',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 102ce61..400bf48 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -34,11 +34,11 @@
       isLogout: 0, // 是否被退出登录
       bizLabCode: localStorage.bizLabCode || '', // 实验室
       labCodeName: localStorage.labCodeName || '', // 实验室名称
-      groupNo: localStorage.groupNo || '', // 组别
-      groupName: localStorage.groupName || '' // 组别名称
+      groupNo: localStorage.groupNo || '', // 部门
+      groupName: localStorage.groupName || '', // 部门名称
     }),
     getters: {
-      isLogin: state => {
+      isLogin: (state) => {
         let retn = false
         if (state.token) {
           retn = true
@@ -46,17 +46,18 @@
         return retn
       },
       // 是否已获取用户信息
-      hasUserInfo: state => {
+      hasUserInfo: (state) => {
         if (state.roleList && state.roleList.length > 0) {
           return true
-        } else {
+        }
+        else {
           return false
         }
       },
-      getPublicKey: state => {
+      getPublicKey: (state) => {
         return state.publicKey
       },
-      getPrivateKey: state => {
+      getPrivateKey: (state) => {
         return state.privateKey
       },
       getMenus: (state): Menu.menu[] => {
@@ -64,14 +65,14 @@
       },
       getBtns: (state): Menu.menu[] => {
         return state.btns
-      }
+      },
     },
     actions: {
       // 获取项目基础配置
       getBaseConfig() {
         return new Promise<any>((resolve, reject) => {
           getConfig()
-            .then(res => {
+            .then((res) => {
               this.publicKey = res.data.publicKey
               localStorage.setItem('publicKey', res.data.publicKey)
               // 保存私钥
@@ -80,7 +81,7 @@
               this.isLogout = 0
               resolve(res.data)
             })
-            .catch(e => {
+            .catch((e) => {
               reject(e)
             })
         })
@@ -94,21 +95,21 @@
       }) {
         return new Promise<void>((resolve, reject) => {
           doLogin(data)
-            .then(res => {
+            .then((res) => {
               localStorage.setItem('token', res.data.token)
               this.username = res.data.username
               this.token = res.data.token
               this.isLogout = 0
               resolve()
             })
-            .catch(error => {
+            .catch((error) => {
               reject(error)
             })
         })
       },
       // 注销
       logout() {
-        return new Promise<void>(resolve => {
+        return new Promise<void>((resolve) => {
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
@@ -117,17 +118,17 @@
           localStorage.removeItem('depId')
           localStorage.removeItem('bizLabCode') // 实验室
           localStorage.removeItem('labCodeName') // 实验室
-          localStorage.removeItem('groupNo') // 组别
-          localStorage.removeItem('groupName') // 组别
+          localStorage.removeItem('groupNo') // 部门
+          localStorage.removeItem('groupName') // 部门
           // localStorage.clear()
           this.username = ''
           this.token = ''
           this.roleList = []
           this.roleNames = []
           this.bizLabCode = '' // 实验室
-          this.groupNo = '' // 组别
-          this.labCodeName = '' // 组别
-          this.groupName = '' // 组别
+          this.groupNo = '' // 部门
+          this.labCodeName = '' // 部门
+          this.groupName = '' // 部门
           routeStore.removeRoutes()
           menuStore.setActived(0)
           resolve()
@@ -135,53 +136,54 @@
       },
       // 获取用户信息
       getUserInfo() {
-        return new Promise<any>(resolve => {
+        return new Promise<any>((resolve) => {
           getInfo()
-            .then(res => {
+            .then((res) => {
               if (res.data.roleIds && res.data.roleIds.length > 0) {
                 this.roleList = res.data.roleIds
                 this.roleNames = res.data.roleNames
                 this.roleTips = res.data.roleTips
                 localStorage.setItem('nameId', res.data.id)
                 localStorage.setItem('depId', res.data.deptId)
-              } else {
+              }
+              else {
                 reject('该用户无角色')
               }
               if (res.data.deptId) {
                 this.deptId = res.data.deptId
                 this.deptName = res.data.deptName
-                // 获取本用户实验室代码、组别
-                getLabAndGroup({ deptId: res.data.deptId }).then(res => {
+                // 获取本用户实验室代码、部门
+                getLabAndGroup({ deptId: res.data.deptId }).then((res) => {
                   this.bizLabCode = res.data.bizLabCode // 实验室
-                  this.groupNo = res.data.groupNo // 组别
+                  this.groupNo = res.data.groupNo // 部门
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCodeEquipment').then(response => {
+                    getDictByCode('bizGroupCodeEquipment').then((response) => {
                       const labCodeList = response.data
                       const index = labCodeList.findIndex(
                         (item: { value: string }) =>
-                          item.value === this.bizLabCode
+                          item.value === this.bizLabCode,
                       )
                       if (index !== -1) {
                         this.labCodeName = labCodeList[index].name // 实验室
                         localStorage.setItem(
                           'labCodeName',
-                          labCodeList[index].name
+                          labCodeList[index].name,
                         )
                       }
                     })
                   }
 
                   if (this.bizLabCode) {
-                    getDictByCode('bizGroupCode').then(response => {
+                    getDictByCode('bizGroupCode').then((response) => {
                       const groupCodeList = response.data
                       const index = groupCodeList.findIndex(
-                        (item: { value: string }) => item.value === this.groupNo
+                        (item: { value: string }) => item.value === this.groupNo,
                       )
                       if (index !== -1) {
                         this.groupName = groupCodeList[index].name
                         localStorage.setItem(
                           'groupName',
-                          groupCodeList[index].name
+                          groupCodeList[index].name,
                         )
                       }
                     })
@@ -190,10 +192,11 @@
                   localStorage.setItem('bizLabCode', res.data.bizLabCode)
                 })
                 // 基本信息-部门接口-查询部门类别
-                getDeptList({ deptName: res.data.deptName }).then(response => {
+                getDeptList({ deptName: res.data.deptName }).then((response) => {
                   this.deptType = response.data.list[0].deptType
                 })
-              } else {
+              }
+              else {
                 reject('该用户无组织机构')
               }
               this.id = res.data.id
@@ -210,13 +213,13 @@
       getPermissions(currentSystem?: { name: string; code: string }) {
         const params = {
           resourceType: '',
-          parentCode: ''
+          parentCode: '',
         }
         if (currentSystem) {
           params.parentCode = currentSystem.code // 子系统code
         }
-        return new Promise<Menu.menu[]>(resolve => {
-          getUserMenus(params).then(response => {
+        return new Promise<Menu.menu[]>((resolve) => {
+          getUserMenus(params).then((response) => {
             const data = response.data
             const menus = [] // 仅菜单
             const btns = [] // 非菜单
@@ -230,14 +233,14 @@
                   const menu_tmp = {
                     url: menu.url,
                     name: menu.name,
-                    icon: menu.icon
+                    icon: menu.icon,
                   }
                   menus.push(menu_tmp)
                 }
                 const btn_tmp = {
                   url: menu.url,
                   name: menu.name,
-                  icon: menu.icon
+                  icon: menu.icon,
                 }
                 btns.push(btn_tmp)
               }
@@ -250,8 +253,8 @@
       },
       // 修改密码
       editPassword(data: { oldPwd: string; newPwd: string }) {
-        return new Promise<object>(resolve => {
-          changePwd(data).then(response => {
+        return new Promise<object>((resolve) => {
+          changePwd(data).then((response) => {
             resolve(response)
           })
         })
@@ -259,9 +262,9 @@
       // 被退出登录
       toLogout() {
         this.isLogout += 1
-      }
-    }
-  }
+      },
+    },
+  },
 )
 
 export default useUserStore
diff --git a/src/views/business/certManage/apply/apply-interface.ts b/src/views/business/certManage/apply/apply-interface.ts
index 5595f43..1fdb9b7 100644
--- a/src/views/business/certManage/apply/apply-interface.ts
+++ b/src/views/business/certManage/apply/apply-interface.ts
@@ -31,7 +31,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   changeApplyNo: string // 申请单编号
   changeApplyName: string // 申请单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/certManage/apply/components/basic.vue b/src/views/business/certManage/apply/components/basic.vue
index 3be1fef..bf02448 100644
--- a/src/views/business/certManage/apply/components/basic.vue
+++ b/src/views/business/certManage/apply/components/basic.vue
@@ -32,7 +32,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   changeApplyNo: '', // 申请单编号
   changeApplyName: '', // 申请单名称
   createUserId: '', // 创建人id
@@ -53,13 +53,13 @@
 
 const rules = ref<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   changeReportNo: [{ required: true, message: '更换证书编号不能为空', trigger: ['change', 'blur'] }],
   changeType: [{ required: true, message: '变更类型不能为空', trigger: ['change', 'blur'] }],
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const changeTypeList = ref<dictType[]>([]) // 变更类型
 
 function getDict() {
@@ -67,7 +67,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -192,7 +192,7 @@
 onMounted(async () => {
   if (props.pageType === 'edit' || props.pageType === 'detail') {
     form.value.labCode = $route.query.labCode as any // 实验室
-    form.value.groupCode = $route.query.groupCode as string // 组别
+    form.value.groupCode = $route.query.groupCode as string // 部门
     form.value.changeApplyNo = $route.query.changeApplyNo as string // 申请单编号
     form.value.changeApplyName = $route.query.changeApplyName as string // 申请单名称
     form.value.createUserId = $route.query.createUserId as string // 创建人id
@@ -236,8 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
index b8d9940..959501b 100644
--- a/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectTaskMeasureCertificateListDialog.vue
@@ -18,7 +18,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -123,7 +123,7 @@
     certificateName: '', //	证书名称
     certificateNo: '', //	证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     labCode: '', //	实验室(字典code)
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
diff --git a/src/views/business/certManage/apply/list.vue b/src/views/business/certManage/apply/list.vue
index 6829e97..fb5e6c3 100644
--- a/src/views/business/certManage/apply/list.vue
+++ b/src/views/business/certManage/apply/list.vue
@@ -211,7 +211,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           changeApplyNo: row.changeApplyNo, // 申请单编号
           changeApplyName: row.changeApplyName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts
index 19d8c65..9fc92d0 100644
--- a/src/views/business/certManage/cert/cert-interface.ts
+++ b/src/views/business/certManage/cert/cert-interface.ts
@@ -17,7 +17,7 @@
   measureValidDateStart: string //		检定有效期开始
   measureValidDateEnd: string //		检定有效期结束
   labCode: string //		实验室(字典code)
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   createUserName: string //		检定员
   formId: string //		表单id
   printStatus: string //		打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue
index 3daaec1..f21f74d 100644
--- a/src/views/business/certManage/cert/list.vue
+++ b/src/views/business/certManage/cert/list.vue
@@ -45,7 +45,7 @@
   measureValidDateStart: '', //		检定有效期开始
   measureValidDateEnd: '', //		检定有效期结束
   labCode: '', //		实验室(字典code)
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   createUserName: '', //		检定员
   formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
   printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -197,7 +197,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -282,7 +282,7 @@
       measureValidDateStart: listQuery.value.measureValidDateStart, //		检定有效期开始
       measureValidDateEnd: listQuery.value.measureValidDateEnd, //		检定有效期结束
       labCode: listQuery.value.labCode, //		实验室(字典code)
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       createUserName: listQuery.value.createUserName, //		检定员
       formId: listQuery.value.formId, //		表单id
       printStatus: listQuery.value.printStatus, // 打印状态(未打印传1,其他状态不传)
diff --git a/src/views/business/certManage/supplement/components/basic.vue b/src/views/business/certManage/supplement/components/basic.vue
index 61921e2..d5ec033 100644
--- a/src/views/business/certManage/supplement/components/basic.vue
+++ b/src/views/business/certManage/supplement/components/basic.vue
@@ -76,7 +76,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
@@ -118,7 +118,7 @@
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: '', //		检定有效期结束
     labCode: '', //		实验室(字典code)
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     createUserName: '', //		检定员
     formId: SCHEDULE.CERTIFICATE_PRINT_APPROVAL, //		表单id
     printStatus: '', // 打印状态(未打印传1,其他状态不传)
@@ -144,7 +144,7 @@
     certificateName: '', //		证书名称
     certificateNo: changeReportNo, //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/certManage/supplement/list.vue b/src/views/business/certManage/supplement/list.vue
index ce4297f..0b3f696 100644
--- a/src/views/business/certManage/supplement/list.vue
+++ b/src/views/business/certManage/supplement/list.vue
@@ -252,7 +252,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           ...row,
         },
       })
@@ -352,7 +352,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index ab91930..9b5bc40 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -9,7 +9,7 @@
   siteExecutiveNo: string // 现场检测编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   orderNo: string // 关联任务单
   limit: number
@@ -31,7 +31,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   siteExecutiveNo: string // 现场检测编号(审批编号)
   siteExecutiveName: string // 现场检测名字(审批名称)
   applyId: string // 申请人id
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 5349362..98ab196 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -36,7 +36,7 @@
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   siteExecutiveNo: '', // 现场检测编号(审批编号)
   siteExecutiveName: '', // 现场检测名字(审批名称)
   applyId: '', // 申请人id
@@ -72,13 +72,13 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 47ec902..a0031cb 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -27,13 +27,13 @@
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') // 组别
+const groupCode = ref('') // 部门
 const changeType = ref('') // 允许筛选条件改变类型
 const selectByUseStatus = ref('') // 固定筛选使用状态
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: props.equipmentName, //		设备名称
   equipmentNo: '', //		设备编号
@@ -143,7 +143,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -207,8 +207,8 @@
 /**
  * 弹窗初始化
  * @param labCode 实验室
- * @param groupCode 组别
- * @param noChange 是否实验室和组别固定，不允许改变
+ * @param groupCode 部门
+ * @param noChange 是否实验室和部门固定，不允许改变
  * @param selectByUseStatusType 固定筛选使用状态的类型
  */
 const initDialog = async (labCodeParam = '', groupCodeParam = '', changeTypeParam = '', selectByUseStatusType = '') => {
@@ -216,7 +216,7 @@
   listQuery.value.labCode = labCodeParam
   listQuery.value.groupCode = groupCodeParam
   labCode.value = labCodeParam// 实验室
-  groupCode.value = groupCodeParam// 组别
+  groupCode.value = groupCodeParam// 部门
   changeType.value = changeTypeParam// 允许筛选条件改变类型
   selectByUseStatus.value = selectByUseStatusType
   dialogFormVisible.value = true
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index f730b40..6bc8b66 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -43,7 +43,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -145,7 +145,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
@@ -196,7 +196,7 @@
       applyTimeStart: listQuery.value.applyTimeStart, // 申请时间开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       executiveItem: listQuery.value.executiveItem, // 测试校准检定项目
       orderNo: listQuery.value.orderNo, // 关联任务单
       offset: 1,
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index 43ef3d7..be4a469 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -21,7 +21,7 @@
   applyTimeStart: '', // 申请时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   orderNo: '', // 关联任务单
   limit: 20,
@@ -76,7 +76,7 @@
     applyTimeStart: '', // 申请时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     orderNo: '', // 关联任务单
     limit: 20,
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 9f30b7b..8d9765d 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -30,8 +30,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '', // 部门
+  groupCodeName: '',	// 部门(字典value)
   logNo: '', // 记录单编号
   logName: '', // 记录单名称
   createUserId: '', // 创建人id
@@ -84,14 +84,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 83fce19..22540f6 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -17,7 +17,7 @@
   siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   executiveItem: '', // 测试校准检定项目
   limit: 20,
   offset: 1,
@@ -90,7 +90,7 @@
     siteExecutiveNo: '', //  现场测试、校准 或检定审批单编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     executiveItem: '', // 测试校准检定项目
     limit: 20,
     offset: 1,
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index 7e67e86..bd4678e 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -6,7 +6,7 @@
   siteExecutiveNo: string //  现场测试、校准 或检定审批单编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   executiveItem: string // 测试校准检定项目
   limit: number
   offset: number
@@ -27,8 +27,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室名称
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   logNo: string // 记录单编号
   logName: string // 记录单名称
   createUserId: string // 创建人id
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index d9fc336..7eb7323 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -55,7 +55,7 @@
   directorId: '', // 负责人Id
   rfid: '', // RFID标签绑定
   useSign: '', // 在用信息(字典code)
-  groupInfos: [], // 组别信息
+  groupInfos: [], // 部门信息
   installLocation: '', // 安装位置(多个用,拼接)
   installLocationExt: '', // 安装位置(自定义编写)
   testTask: '', // 参试任务
@@ -466,7 +466,7 @@
       </el-form>
     </detail-block>
 
-    <!-- 组别信息 -->
+    <!-- 部门信息 -->
     <detail-block title="">
       <el-form
         ref="sourceFormRef"
diff --git a/src/views/business/manager/sendReceive/sendReceive-interface.ts b/src/views/business/manager/sendReceive/sendReceive-interface.ts
index abc0fde..0fb4530 100644
--- a/src/views/business/manager/sendReceive/sendReceive-interface.ts
+++ b/src/views/business/manager/sendReceive/sendReceive-interface.ts
@@ -70,7 +70,7 @@
   directorId?: string // 负责人id
   rfid: string // RFID标签绑定
   useSign: string // 在用信息(字典code)
-  groupInfos: Array<any> // 组别信息
+  groupInfos: Array<any> // 部门信息
   installLocation: string // 安装位置(多个用,拼接)
   installLocationExt: string // 安装位置(自定义编写)
   testTask: string // 参试任务
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 48adada..6fd702c 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -846,16 +846,16 @@
   <app-container>
     <detail-page :title="`配置检定项-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="saveTemplate">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="saveTemplate">
           存为模板
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="quote">
+        <el-button v-if="pageType !== 'detail' && !isNeverDefineItemCategory" type="primary" @click="quote">
           引用模板
         </el-button>
         <!-- <el-button v-if="pageType !== 'detail'" type="warning" @click="clear">
           清空配置
         </el-button> -->
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+        <el-button v-if="pageType === 'detail' && !isNeverDefineItemCategory" type="primary" @click="edit">
           编辑
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -1041,7 +1041,7 @@
     </detail-block>
 
     <!-- 检定项备注 -->
-    <el-form :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
+    <el-form v-if="!isNeverDefineItemCategory" :model="form" label-width="120" label-position="right" :rules="rules" style="margin-top: 20px;">
       <el-row>
         <el-col :span="12">
           <el-form-item label="检定项备注:" prop="itemRemark">
diff --git a/src/views/business/subpackage/agreement/agreement-interface.ts b/src/views/business/subpackage/agreement/agreement-interface.ts
index 9fcbf21..ad5888e 100644
--- a/src/views/business/subpackage/agreement/agreement-interface.ts
+++ b/src/views/business/subpackage/agreement/agreement-interface.ts
@@ -35,7 +35,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   protocolNo: string // 协议书编号
   projectName: string // 协议书名称
   formId: string
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 2f4444c..344c64a 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -39,7 +39,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   protocolNo: '', // 协议书编号
   projectName: '', // 协议书名称
   formId: '',
@@ -68,7 +68,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   accessNo: [{ required: true, message: '分包方评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   mobile: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -98,7 +98,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/inform/components/basic.vue b/src/views/business/subpackage/inform/components/basic.vue
index 4f05b4a..92b2e66 100644
--- a/src/views/business/subpackage/inform/components/basic.vue
+++ b/src/views/business/subpackage/inform/components/basic.vue
@@ -41,7 +41,7 @@
 const user = useUserStore() // 用户信息
 const form: Ref<IForm> = ref({
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   noticeNo: '', // 通知书编号
   noticeName: '', // 通知书名称
   formId: '',
@@ -76,7 +76,7 @@
 const rules = ref<FormRules>({
   // 表单验证规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方不能为空', trigger: ['blur', 'change'] }],
   accessId: [{ required: true, message: '分包评审表不能为空', trigger: ['blur', 'change'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
@@ -84,7 +84,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 async function getDict() {
@@ -97,7 +97,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -344,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
+            <el-form-item label="部门" prop="groupCode">
               <el-select
                 v-model="form.groupCode"
-                :placeholder="pageType === 'detail' ? ' ' : '请选择组别'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择部门'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
               >
diff --git a/src/views/business/subpackage/inform/inform-interface.ts b/src/views/business/subpackage/inform/inform-interface.ts
index 7ebad1f..ae228be 100644
--- a/src/views/business/subpackage/inform/inform-interface.ts
+++ b/src/views/business/subpackage/inform/inform-interface.ts
@@ -32,7 +32,7 @@
 // 表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   noticeNo: string // 通知书编号
   noticeName: string // 通知书名称
   formId: string
diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index d6021d8..b01c921 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -167,7 +167,7 @@
 
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const meterIdentifyMap = ref([]) as any // 计量标识
 
@@ -182,7 +182,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index d455568..ea3b3a7 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -35,8 +35,8 @@
 export interface IForm {
   labCode: string // 实验室
   labCodeName: string // 实验室
-  groupCode: string // 组别
-  groupCodeName: string // 组别
+  groupCode: string // 部门
+  groupCodeName: string // 部门
   projectNo: string // 评审表编号
   projectName: string // 评审表名称
   formId: string
diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts
index 08ab5d4..52767dc 100644
--- a/src/views/business/taskMeasure/certificate/certificate-interface.ts
+++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts
@@ -4,7 +4,7 @@
   certificateName: string //		证书名称
   certificateNo: string //		证书编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
   manufacturer: string //		生产厂家
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index b657fff..c528817 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -38,7 +38,7 @@
   certificateName: '', //		证书名称
   certificateNo: '', //		证书编号
   formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
   manufacturer: '', //		生产厂家
@@ -179,7 +179,7 @@
     certificateName: '', //		证书名称
     certificateNo: '', //		证书编号
     formId: SCHEDULE.CERTIFICATE_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
     manufacturer: '', //		生产厂家
@@ -344,7 +344,7 @@
       certificateName: listQuery.value.certificateName, //		证书名称
       certificateNo: listQuery.value.certificateNo, //		证书编号
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, //		生产厂家
diff --git a/src/views/business/taskMeasure/labTask/list.vue b/src/views/business/taskMeasure/labTask/list.vue
index 9517640..caf8b14 100644
--- a/src/views/business/taskMeasure/labTask/list.vue
+++ b/src/views/business/taskMeasure/labTask/list.vue
@@ -47,7 +47,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -185,7 +185,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
@@ -270,7 +270,7 @@
       traceDateEnd: listQuery.value.traceDateEnd, //	测试、校准或检定日期结束
       restrictionInstruction: listQuery.value.restrictionInstruction, // 限用说明
       conclusion: listQuery.value.conclusion, // 结论
-      groupCode: listQuery.value.groupCode, // 实验室组别
+      groupCode: listQuery.value.groupCode, // 实验室部门
       labCode: listQuery.value.labCode, // 实验室
       glStaff: listQuery.value.glStaff, // 是否为综合管理组人员1/0
       offset: 1,
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index a4c8684..5b3dd1b 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -185,13 +185,13 @@
 const lineModeList = ref<dictType[]>([]) // 两线/四线模式
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index 7701b09..4188c1e 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -145,14 +145,14 @@
 const positionList = ref([]) as any // 测试、校准或检定地点
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 获取字典值
 async function getDict() {
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index eb2b429..61c3ddc 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -693,18 +693,18 @@
     return false
   }
   if (user.groupNo === '') {
-    // ElMessage.warning('此用户没有组别，不允许生成证书')
+    // ElMessage.warning('此用户没有部门，不允许生成证书')
     ElMessage.warning('此用户非计量人员，不允许生成证书')
     return false
   }
   console.log('实验室', user.bizLabCode)
-  console.log('组别', user.groupNo)
+  console.log('部门', user.groupNo)
   if (belongStandardEquipment.value === '4') { // 0.02活塞需要添加配置项
     if (itemCategoryName.value === '电接点一般压力表') {
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -717,7 +717,7 @@
       params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
         dataId: solvedParams.dataId, // 检定数据管理基础信息表id
         id: '',
@@ -732,7 +732,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -744,7 +744,7 @@
     params = {
       ...solvedParams,
       labCode: user.bizLabCode, // 实验室
-      groupCode: user.groupNo, // 组别
+      groupCode: user.groupNo, // 部门
       certificateName: `${solvedParams.sampleName}-${solvedParams.traceDate}`, // 检定审批报告名称
       dataId: solvedParams.dataId, // 检定数据管理基础信息表id
       id: '',
@@ -808,7 +808,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
index 5b7b4a8..5a4dab1 100644
--- a/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/saveMeasureCertificateDialog.vue
@@ -12,7 +12,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   certificateName: '', // 检定审批报告名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -21,12 +21,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -34,7 +34,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   certificateName: [{ required: true, message: '检定审批报告名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -124,8 +124,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
index 0dd7a70..526ce1f 100644
--- a/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/batchAddLabTaskDialog.vue
@@ -34,7 +34,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '', // 是否为综合管理组人员1/0
   offset: 1,
@@ -165,7 +165,7 @@
     traceDateEnd: '', //	测试、校准或检定日期结束
     restrictionInstruction: '', // 限用说明
     conclusion: '', // 结论
-    groupCode: '', // 实验室组别
+    groupCode: '', // 实验室部门
     labCode: '', // 实验室
     glStaff: '', // 是否为综合管理组人员1/0
     offset: 1,
diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index ab219ba..9897df1 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -3,41 +3,41 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
-import { getRangeAllTime } from '@/utils/date'
 import { device } from './img'
+import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
   getDeptExpire,
-  getDeviceType,
+  getDeviceMaintain,
   getDeviceStatus,
-  getTraceAnalyse,
+  getDeviceType,
   getStandardDeviceType,
-  getDeviceMaintain
+  getTraceAnalyse,
 } from '@/api/dataManagement/data/device'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 const year = ref('') // 年度
 const yearList = ref<string[]>([])
 
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 基础信息展示数据
 const baseInfo = ref([
@@ -46,36 +46,36 @@
     value: 'equipmentAmount',
     data: '',
     icon: device['在用设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '在用标准设备总量',
     value: 'standardAmount',
     data: '',
     icon: device['在用标准设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '本年度到期设备总量',
     value: 'expireAmount',
     data: '',
     icon: device['本年度到期设备总量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '应溯源总数量',
     value: 'shouldTraceAmount',
     data: '',
     icon: device['应溯源总数量'],
-    color: '#1AAF8B'
+    color: '#1AAF8B',
   },
   {
     name: '实际溯源总数量',
     value: 'tracedAmount',
     data: '',
     icon: device['实际溯源总数量'],
-    color: '#1AAF8B'
-  }
+    color: '#1AAF8B',
+  },
 ])
 const showChart = ref<any[]>([
   {
@@ -85,7 +85,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '设备类型分析',
@@ -94,7 +94,7 @@
     center: ['50%', '60%'],
     labelPosition: 'outside',
     radius: '70%',
-    data: []
+    data: [],
   },
   {
     name: '标准设备种类分析',
@@ -105,19 +105,19 @@
       {
         text: '标准设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '设备状态分析',
     type: 'bar-vertical',
-    source: 'system'
+    source: 'system',
   },
   {
     name: '设备维护保养情况',
@@ -129,44 +129,43 @@
         text: '实验室',
         value: 'labCodeName',
         align: 'center',
-        width: '75'
+        width: '75',
       },
       {
-        text: '组别',
+        text: '部门',
         value: 'groupCodeName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '设备名称',
         value: 'equipmentName',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '规格型号',
         value: 'model',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '月保养次数',
         value: 'monthAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
       {
         text: '周维护次数',
         value: 'weekAmount',
         align: 'center',
-        width: '95'
+        width: '95',
       },
-    ]
+    ],
   },
   {
     name: '设备溯源分析',
     type: 'bar-horizontal',
-    source: 'system'
+    source: 'system',
   },
 
-
 ])
 watch(
   () => showChart.value.length,
@@ -175,171 +174,171 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo(searchQueryResult.value).then(res => {
-    baseInfo.value.forEach(item => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 近一年部门设备到期趋势
-  getDeptExpire(searchQueryResult.value).then(res => {
+  getDeptExpire(searchQueryResult.value).then((res) => {
     console.log(res.data, '近一年部门设备到期趋势')
     const current = showChart.value.filter(
-      item => item.name === '近一年部门设备到期趋势'
+      item => item.name === '近一年部门设备到期趋势',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
       {
         name: '电学电源组',
-        value: 'ddAmount'
+        value: 'ddAmount',
       },
       {
         name: '热工压力组',
-        value: 'rlAmount'
+        value: 'rlAmount',
       },
       {
         name: '无线脉冲组',
-        value: 'wmAmount'
+        value: 'wmAmount',
       },
       {
         name: '综合管理组',
-        value: 'glAmount'
-      }
+        value: 'glAmount',
+      },
     ]
     current.data = data.map((item: any) => ({
       name: item.name,
       symbol: 'emptyCircle',
-      data: res.data.map((citem: any) => String(citem[item.value]))
+      data: res.data.map((citem: any) => String(citem[item.value])),
     }))
   })
   // 设备类型分析
-  getDeviceType(searchQueryResult.value).then(res => {
+  getDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备类型分析')
     const data = [
       {
         name: '标准设备',
         value: 'standardAmount',
-        data: ''
+        data: '',
       },
       {
         name: '配套设备',
         value: 'equipmentAmount',
-        data: ''
+        data: '',
       },
       {
         name: '其他设备',
         value: 'otherAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '设备类型分析'
+      item => item.name === '设备类型分析',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: String(item.data) }))
   })
   // 设备状态分析
-  getDeviceStatus(searchQueryResult.value).then(res => {
+  getDeviceStatus(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备状态分析')
     const current = showChart.value.filter(
-      item => item.name === '设备状态分析'
+      item => item.name === '设备状态分析',
     )[0]
     const data = [
       {
         name: '在用',
         value: 'onUseAmount',
-        data: ''
+        data: '',
       },
       {
         name: '禁用',
         value: 'disableAmount',
-        data: ''
+        data: '',
       },
       {
         name: '报废',
         value: 'scrapAmount',
-        data: ''
+        data: '',
       },
       {
         name: '延用',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '封存',
         value: 'sealAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 设备溯源分析
-  getTraceAnalyse(searchQueryResult.value).then(res => {
+  getTraceAnalyse(searchQueryResult.value).then((res) => {
     console.log(res.data, '设备溯源分析')
     const current = showChart.value.filter(
-      item => item.name === '设备溯源分析'
+      item => item.name === '设备溯源分析',
     )[0]
     const data = [
       {
         name: '合格',
         value: 'qualifiedAmount',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrictAmount',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'stopAmount',
-        data: ''
+        data: '',
       },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.xAxisData = data.map((item: any) => item.name)
     current.data = [
       {
         name: '数量',
-        data: data.map((item: any) => String(item.data))
-      }
+        data: data.map((item: any) => String(item.data)),
+      },
     ]
   })
   // 标准设备种类分析
-  getStandardDeviceType(searchQueryResult.value).then(res => {
+  getStandardDeviceType(searchQueryResult.value).then((res) => {
     console.log(res.data, '标准设备种类分析')
     const current = showChart.value.filter(
-      item => item.name === '标准设备种类分析'
+      item => item.name === '标准设备种类分析',
     )[0]
     current.data = []
-    for(const i in res.data) {
-      current.data.push({ name: i, count: res.data[i]})
+    for (const i in res.data) {
+      current.data.push({ name: i, count: res.data[i] })
     }
     current.data.reverse()
   })
   // 设备维护保养情况
-  getDeviceMaintain({ ...searchQueryResult.value, offset:1, limit: 9999}).then(res => {
+  getDeviceMaintain({ ...searchQueryResult.value, offset: 1, limit: 9999 }).then((res) => {
     console.log(res.data, '设备维护保养情况')
     const current = showChart.value.filter(
-      item => item.name === '设备维护保养情况'
+      item => item.name === '设备维护保养情况',
     )[0]
     current.data = []
     current.data = res.data.rows
@@ -384,7 +383,7 @@
   // }, 3000)
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 拖拽结束
 const onEnd = () => {
@@ -401,7 +400,7 @@
 
 watch(
   () => year.value,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       console.log(newVal, '当前年度')
       searchQueryResult.value.timeStart = `${newVal}-01-01`
@@ -410,7 +409,7 @@
         fetchData()
       })
     }
-  }
+  },
 )
 onMounted(() => {
   year.value = String(currentYear)
@@ -427,10 +426,10 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="year"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
         placeholder="年度"
       >
@@ -446,9 +445,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -476,8 +475,8 @@
           <div
             :style="{
               width: `${
-                 '31.5%'
-              }`
+                '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -485,15 +484,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -506,7 +505,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -522,7 +521,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -531,7 +530,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -546,7 +545,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -555,7 +554,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -571,7 +570,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -586,7 +585,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -602,12 +601,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 6bf873e..b45246e 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -3,37 +3,37 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { meteringVerification } from './img'
 import { getRangeAllTime } from '@/utils/date'
 import type { deptType, dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import ScrollTable from '@/components/ScrollTable/index.vue'
 // import { getEquipmentList } from '@/api/equipment/info/book'
 import {
+  getAlreadyDeviceRank,
   getBaseInfo,
   getDeviceAnalysis,
-  getAlreadyDeviceRank,
   getTimelyAnalysis,
-  getVerificationResult
+  getVerificationResult,
 } from '@/api/dataManagement/data/verificationAnalysis'
 // import { getCompanyList } from '@/api/system/dept'
 import { getCustomerInfoList } from '@/api/resource/customer'
 import { getEquipmentList } from '@/api/business/manager/order'
 import { uniqueMultiArray } from '@/utils/Array'
-import { meteringVerification } from './img'
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 // 检定结果分析查询条件
 const searchQueryResult = ref({
@@ -44,12 +44,12 @@
   model: '',
   sampleName: '',
   timeEnd: '',
-  timeStart: ''
+  timeStart: '',
 })
 const datetimerange = ref()
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     searchQueryResult.value.timeStart = ''
     searchQueryResult.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -58,11 +58,11 @@
         searchQueryResult.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
 // 实验室
 const labCodeList = ref<dictType[]>([])
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 委托方
 const customerList = ref<any[]>([])
@@ -77,42 +77,43 @@
 // 查询检定结果分析
 const searchList = () => {
   // 检定结果分析
-  getVerificationResult(searchQueryResult.value).then(res => {
+  getVerificationResult(searchQueryResult.value).then((res) => {
     const data = [
       {
         name: '合格',
         value: 'qualified',
-        data: ''
+        data: '',
       },
       {
         name: '限用',
         value: 'restrict',
-        data: ''
+        data: '',
       },
       {
         name: '停用',
         value: 'deactivate',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
       // item.data = String(Math.floor(Math.random() * 100) + 1)
     })
     const current = showChart.value.filter(
-      item => item.name === '检定结果分析'
+      item => item.name === '检定结果分析',
     )[0]
     current.data = [
       {
         name: '数量',
-        data: data.map(item => item.data)
-      }
+        data: data.map(item => item.data),
+      },
     ]
     current.xAxisData = data.map(item => item.name)
     // 判断是否为空
     if (current.data[0].data.every((item: any) => String(item) === '0')) {
       current.isEmpty = true
-    } else {
+    }
+    else {
       current.isEmpty = false
     }
   })
@@ -127,7 +128,7 @@
     model: '',
     sampleName: '',
     timeEnd: '',
-    timeStart: ''
+    timeStart: '',
   }
   searchList()
 }
@@ -137,64 +138,64 @@
     value: 'measuringAmount',
     data: '',
     icon: meteringVerification['在检设备总量'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '超期未检设备总量',
     value: 'overdueAmount',
     data: '',
     icon: meteringVerification['超期未检设备总量'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '已检设备总量(本年)',
     value: 'measuredAmount',
     data: '',
     icon: meteringVerification['已检设备总量(本年)'],
-    color: '#2AA515'
+    color: '#2AA515',
   },
   {
     name: '检定合格率(本年)',
     value: 'passRate',
     data: '',
     icon: meteringVerification['检定合格率(本年)'],
-    color: '#02A7F0'
+    color: '#02A7F0',
   },
   {
     name: '停用率(本年)',
     value: 'stopRate',
     data: '',
     icon: meteringVerification['停用率(本年)'],
-    color: '#D81E06'
+    color: '#D81E06',
   },
   {
     name: '计量室检定率',
     value: 'insideRate',
     data: '',
     icon: meteringVerification['计量室检定率(本年)'],
-    color: '#02A7F0'
-  }
+    color: '#02A7F0',
+  },
 ])
 onMounted(() => {
   if (props.lab) {
     searchQueryResult.value.labCode = props.lab
     // 实验室
-    getDictByCode('bizGroupCodeEquipment').then(response => {
+    getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
       fetchData()
     })
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
       const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
-      tempMenu.forEach(item => {
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -215,14 +216,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '当年已检设备排行TOP10',
@@ -233,14 +234,14 @@
       {
         text: '设备名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '已检数量',
         value: 'count',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定及时分析',
@@ -255,14 +256,14 @@
       {
         text: '名称',
         value: 'name',
-        align: 'center'
+        align: 'center',
       },
       {
         text: '数量',
         value: 'value',
-        align: 'center'
-      }
-    ]
+        align: 'center',
+      },
+    ],
   },
   {
     name: '检定结果分析',
@@ -271,8 +272,8 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: false
-  }
+    gradient: false,
+  },
 ])
 
 watch(
@@ -282,91 +283,91 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 const loading = ref(false)
 function fetchData() {
   // 获取基础数据
-  getBaseInfo({ labCode: props.lab }).then(res => {
+  getBaseInfo({ labCode: props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
   // 在检设备分析
-  getDeviceAnalysis({ labCode: props.lab }).then(res => {
+  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
         value: 'outsourceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '电学电源组',
         value: 'ddAmount',
-        data: ''
+        data: '',
       },
       {
         name: '热工力学组',
         value: 'rlAmount',
-        data: ''
+        data: '',
       },
       {
         name: '无线电脉冲组',
         value: 'wmAmount',
-        data: ''
+        data: '',
       },
       {
         name: '设备分发中',
         value: 'distributeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '在检设备分析'
+      item => item.name === '在检设备分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 当年已检设备排行
-  getAlreadyDeviceRank({ labCode: props.lab }).then(res => {
+  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
     const current = showChart.value.filter(
-      item => item.name === '当年已检设备排行TOP10'
+      item => item.name === '当年已检设备排行TOP10',
     )[0]
     current.data = []
     for (const i in res.data) {
       current.data.push({
         name: i,
-        count: res.data[i]
+        count: res.data[i],
       })
     }
   })
   // 检定及时分析
-  getTimelyAnalysis({ labCode: props.lab }).then(res => {
+  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
         value: 'advanceAmount',
-        data: ''
+        data: '',
       },
       {
         name: '滞后检定',
         value: 'delayAmount',
-        data: ''
+        data: '',
       },
       {
         name: '按时检定',
         value: 'onTimeAmount',
-        data: ''
-      }
+        data: '',
+      },
     ]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     const current = showChart.value.filter(
-      item => item.name === '检定及时分析'
+      item => item.name === '检定及时分析',
     )[0]
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
@@ -374,7 +375,7 @@
   searchList()
 }
 defineExpose({
-  showChart
+  showChart,
 })
 // 获取委托方列表
 const fetchCompanyList = () => {
@@ -382,12 +383,12 @@
     limit: 9999,
     offset: 1,
     approvalStatus: '0',
-    formId: 'zyglwtfml'
-  }).then(res => {
+    formId: 'zyglwtfml',
+  }).then((res) => {
     customerList.value = res.data.rows.map((item: any) => ({
       name: item.customerName,
       id: item.id,
-      value: item.id
+      value: item.id,
     }))
   })
 }
@@ -398,17 +399,17 @@
     customerId: searchQueryResult.value.customerId,
     equipmentType: '1',
     offset: 1,
-    limit: 9999
-  }).then(res => {
+    limit: 9999,
+  }).then((res) => {
     console.log(res.data, '受检设备')
     allDeviceList.value = res.data.rows
     sampleNameList.value = uniqueMultiArray(
       res.data.rows.map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-      'sampleName'
+      'sampleName',
     )
   })
 }
@@ -440,9 +441,9 @@
       .map((item: any) => ({
         sampleName: item.equipmentName,
         model: item.model,
-        helpInstruction: item.helpInstruction
+        helpInstruction: item.helpInstruction,
       })),
-    'model'
+    'model',
   )
   helpInstructionList.value = modelList.value
   console.log(modelList.value, 'modelList.value')
@@ -453,7 +454,7 @@
   helpInstructionList.value = []
   searchQueryResult.value.helpInstruction = ''
   helpInstructionList.value = modelList.value.filter(
-    item => item.model === value
+    item => item.model === value,
   )
 }
 // 拖拽结束
@@ -474,10 +475,10 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
             <!-- <svg-icon name="icon-env-device-online" class="icon-button-icon" /> -->
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -508,9 +509,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -520,16 +521,16 @@
             <div v-loading="loading" class="chart-page">
               <div
                 v-if="element.type === 'pie'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-show="element.showType == 'pie'"
                     :title="element.title"
@@ -545,7 +546,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -554,12 +555,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-show="element.showType == 'table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -568,18 +569,18 @@
               </div>
               <div
                 v-if="element.type === 'rank-table'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <scroll-table
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="300"
                     :data="element.data"
                     :columns="element.columns"
@@ -588,11 +589,11 @@
               </div>
               <div
                 v-if="element.type === 'bar-horizontal'"
-                style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%;"
               >
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%"
+                  style="width: 100%; height: 10%;"
                   @click="changeShowType(element)"
                 >
                   {{ element.name }}
@@ -607,7 +608,7 @@
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.labCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="实验室"
                       clearable
@@ -617,15 +618,16 @@
                         :key="item.id"
                         :label="item.name"
                         :value="item.value"
-                      /> </el-select
-                  ></search-item>
-                  <!-- 组别 -->
+                      />
+                    </el-select>
+                  </search-item>
+                  <!-- 部门 -->
                   <search-item>
                     <el-select
                       v-model="searchQueryResult.groupCode"
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
-                      placeholder="组别"
+                      placeholder="部门"
                       clearable
                     >
                       <el-option
@@ -641,7 +643,7 @@
                     <el-select
                       v-model="searchQueryResult.customerId"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="委托方"
                       clearable
@@ -660,7 +662,7 @@
                     <el-select
                       v-model="searchQueryResult.sampleName"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="受检设备名称"
                       clearable
@@ -679,7 +681,7 @@
                     <el-select
                       v-model="searchQueryResult.model"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="规格型号"
                       clearable
@@ -698,7 +700,7 @@
                     <el-select
                       v-model="searchQueryResult.helpInstruction"
                       filterable
-                      style="width: 130px"
+                      style="width: 130px;"
                       class="short-input"
                       placeholder="辅助字段"
                       clearable
@@ -713,7 +715,7 @@
                   </search-item>
                   <!-- 时间 -->
                   <search-item>
-                    <div style="width: 350px !important">
+                    <div style="width: 350px !important;">
                       <el-date-picker
                         v-model="datetimerange"
                         type="daterange"
@@ -727,7 +729,7 @@
                     </div>
                   </search-item>
                 </search-area>
-                <div style="width: 100%; height: 70%">
+                <div style="width: 100%; height: 70%;">
                   <el-empty
                     v-show="element.isEmpty"
                     :image-size="100"
@@ -746,7 +748,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                 </div>
@@ -922,6 +924,7 @@
         color: #3d6fb6;
         font-size: 18px;
         font-weight: 700;
+
         &:hover {
           cursor: pointer;
         }
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 02380b0..a1f2fb0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -3,28 +3,28 @@
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
 import { colors } from '../environment/colors'
+import { resourceManage } from './img'
 import type { deptType, dictType } from '@/global'
 import { getRangeAllTime } from '@/utils/date'
 import {
   getBaseInfo,
-  getCertExpire,
   getCertDistribute,
+  getCertExpire,
   getFileCategory,
-  getFileNovelty
+  getFileNovelty,
 } from '@/api/dataManagement/data/resourceManagement'
 import { getDictByCode } from '@/api/system/dict'
-import { resourceManage } from './img'
 
 const props = defineProps({
   lab: {
     type: String,
-    default: ''
-  }
+    default: '',
+  },
 })
 // 检定结果分析查询条件
 const searchQueryResult = ref({
   groupCode: '',
-  labCode: ''
+  labCode: '',
 })
 watch(() => searchQueryResult.value.groupCode, () => {
   fetchData()
@@ -33,11 +33,11 @@
 const datetimerange = ref()
 const certDistribute = ref({
   timeStart: '',
-  timeEnd: ''
+  timeEnd: '',
 })
 watch(
   () => datetimerange.value,
-  newVal => {
+  (newVal) => {
     certDistribute.value.timeStart = ''
     certDistribute.value.timeEnd = ''
     if (Array.isArray(newVal)) {
@@ -46,9 +46,9 @@
         certDistribute.value.timeEnd = `${newVal[1]}`
       }
     }
-  }
+  },
 )
-// 组别
+// 部门
 const groupCodeList = ref<dictType[]>([])
 // 基础信息展示数据
 const baseInfo = ref([
@@ -57,52 +57,52 @@
     value: 'staffAmount',
     data: '',
     icon: resourceManage['人员总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '体系文件总数',
     value: 'systemFileAmount',
     data: '',
     icon: resourceManage['体系文件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '测试校准检定方法总数',
     value: 'techniqueFileAmount',
     data: '',
     icon: resourceManage['测试校准检定方法总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '在用软件总数',
     value: 'softwareAmount',
     data: '',
     icon: resourceManage['在用软件总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '合格供方总数',
     value: 'supplierAmount',
     data: '',
     icon: resourceManage['合格供方总数'],
-    color: '#0000FF'
+    color: '#0000FF',
   },
   {
     name: '委托方总数',
     value: 'customerAmount',
     data: '',
     icon: resourceManage['委托方总数'],
-    color: '#0000FF'
-  }
+    color: '#0000FF',
+  },
 ])
 watch(
   () => props.lab,
-  newVal => {
+  (newVal) => {
     if (newVal) {
       searchQueryResult.value.labCode = props.lab
       fetchData()
     }
-  }
+  },
 )
 const showChart = ref<any[]>([
   {
@@ -112,7 +112,7 @@
     xAxisData: [],
     data: [],
     smooth: false,
-    gradient: true
+    gradient: true,
   },
   {
     name: '人员证书分布',
@@ -121,7 +121,7 @@
     legendData: [],
     xAxisData: [],
     data1: [],
-    data2: []
+    data2: [],
   },
   {
     name: '体系文件分类',
@@ -131,13 +131,13 @@
     labelPosition: 'outside',
     radius: ['60%', '45%'],
     title: ' ',
-    showTotal: true
+    showTotal: true,
   },
   {
     name: '测试校准检定方法查新分析',
     type: 'bar-vertical',
-    source: 'bar'
-  }
+    source: 'bar',
+  },
 ])
 watch(
   () => showChart.value.length,
@@ -146,40 +146,40 @@
       const resize = new Event('resize')
       window.dispatchEvent(resize)
     })
-  }
+  },
 )
 // 模拟数据
 const loading = ref(false)
 function fetchData() {
   // 获取基础信息
-  getBaseInfo(searchQueryResult.value).then(res => {
+  getBaseInfo(searchQueryResult.value).then((res) => {
     console.log(res.data, '基础信息')
-    baseInfo.value.forEach(item => {
+    baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
     })
   })
-  //人员持证到期趋势
+  // 人员持证到期趋势
   getCertExpire({ ...searchQueryResult.value, ...certDistribute.value }).then(
-    res => {
+    (res) => {
       console.log(res.data, '人员持证到期趋势')
       const current = showChart.value.filter(
-      item => item.name === '人员持证到期趋势'
-    )[0]
-    current.data = [
-      {
-        name: '人员证书到期数量',
-        symbol: 'emptyCircle',
-        data: res.data.map((item: any) => String(item.certExpireAmount))
-      }
-    ]
-    current.xAxisData =  res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
-    }
+        item => item.name === '人员持证到期趋势',
+      )[0]
+      current.data = [
+        {
+          name: '人员证书到期数量',
+          symbol: 'emptyCircle',
+          data: res.data.map((item: any) => String(item.certExpireAmount)),
+        },
+      ]
+      current.xAxisData = res.data.map((item: any) => `${item.year}第${item.quarter}季度`)
+    },
   )
-  //人员证书分布
-  getCertDistribute(searchQueryResult.value).then(res => {
+  // 人员证书分布
+  getCertDistribute(searchQueryResult.value).then((res) => {
     console.log(res.data, '人员证书分布')
     const current = showChart.value.filter(
-      item => item.name === '人员证书分布'
+      item => item.name === '人员证书分布',
     )[0]
     current.legendData = ['证书总数', '有效证书总数']
     current.xAxisData = res.data.map((item: any) => item.certTypeName)
@@ -187,54 +187,54 @@
     current.data2 = res.data.map((item: any) => String(item.validAmount))
   })
   // 体系文件分类
-  getFileCategory(searchQueryResult.value).then(res => {
+  getFileCategory(searchQueryResult.value).then((res) => {
     console.log(res.data, '体系文件分类')
     const data = [
       {
         name: '质量手册',
         value: 'qualityManual',
-        data: ''
+        data: '',
       },
       {
         name: '程序文件',
         value: 'programFile',
-        data: ''
+        data: '',
       },
       {
         name: '作业指导书',
         value: 'homeworkGuidebook',
-        data: ''
+        data: '',
       },
       {
         name: '其他',
         value: 'other',
-        data: ''
-      }
+        data: '',
+      },
     ]
     const current = showChart.value.filter(
-      item => item.name === '体系文件分类'
+      item => item.name === '体系文件分类',
     )[0]
-    data.forEach(item => {
+    data.forEach((item) => {
       item.data = res.data[item.value]
     })
     current.data = data.map(item => ({ name: item.name, value: item.data }))
   })
   // 测试校准检定方法查新分析
-  getFileNovelty(searchQueryResult.value).then(res => {
+  getFileNovelty(searchQueryResult.value).then((res) => {
     console.log(res.data, '测试校准检定方法查新分析')
     const current = showChart.value.filter(
-      item => item.name === '测试校准检定方法查新分析'
+      item => item.name === '测试校准检定方法查新分析',
     )[0]
     current.xAxisData = res.data.map((item: any) => item.groupCodeName)
     current.data = [
       {
         name: '有查新',
-        data: res.data.map((item: any) => String(item.haveNovelty))
+        data: res.data.map((item: any) => String(item.haveNovelty)),
       },
       {
         name: '无查新',
-        data: res.data.map((item: any) => String(item.noNovelty))
-      }
+        data: res.data.map((item: any) => String(item.noNovelty)),
+      },
     ]
   })
   // loading.value = true
@@ -280,7 +280,7 @@
 //   fetchData()
 // }, 100)
 defineExpose({
-  showChart
+  showChart,
 })
 
 // 拖拽结束
@@ -294,21 +294,21 @@
     datetimerange.value = [
       // dayjs().subtract(6, 'month').format('YYYY-MM-DD'),
       `${new Date().getFullYear()}-01-01`,
-      dayjs().format('YYYY-MM-DD')
+      dayjs().format('YYYY-MM-DD'),
     ]
     searchQueryResult.value.labCode = props.lab
-    // 组别
-    getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
-      tempMenu.forEach(item => {
+    // 部门
+    getDictByCode('bizGroupCode').then((response) => {
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      tempMenu.forEach((item) => {
         const tempFindData = response.data.find(
-          (e: { name: string; value: string }) => e.name === item
+          (e: { name: string; value: string }) => e.name === item,
         )
         if (tempFindData) {
           groupCodeList.value.push({
             name: tempFindData.name,
             id: `${tempFindData.id}`,
-            value: `${tempFindData.value}`
+            value: `${tempFindData.value}`,
           })
         }
       })
@@ -324,12 +324,12 @@
   <div class="container">
     <div class="btns">
       <div />
-      <!-- 组别 -->
+      <!-- 部门 -->
       <el-select
         v-model="searchQueryResult.groupCode"
-        style="width: 130px"
+        style="width: 130px;"
         class="short-input"
-        placeholder="组别"
+        placeholder="部门"
         clearable
       >
         <el-option
@@ -344,9 +344,9 @@
     <div class="content-count">
       <!-- 统计数据 -->
       <div class="count">
-        <div class="count-item" v-for="item in baseInfo" :key="item.value">
+        <div v-for="item in baseInfo" :key="item.value" class="count-item">
           <div class="header-icon">
-            <img :src="item.icon" />
+            <img :src="item.icon">
           </div>
           <div class="header-content">
             <div class="content-title">
@@ -377,9 +377,9 @@
                 showChart.length === 4
                   ? '48%'
                   : index === 0 || index === 1
-                  ? '48%'
-                  : '31.5%'
-              }`
+                    ? '48%'
+                    : '31.5%'
+              }`,
             }"
             class="chart-item"
           >
@@ -387,15 +387,15 @@
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
-              <div style="width: 100%; height: 100%">
+              <div style="width: 100%; height: 100%;">
                 <div
                   class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
+                  style="width: 100%; height: 10%; display: flex;"
                 >
                   {{ element.name }}
                   <div
                     v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
+                    style="width: 350px; margin-left: 40px;"
                   >
                     <el-date-picker
                       v-model="datetimerange"
@@ -408,7 +408,7 @@
                     />
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
+                <div style="width: 100%; height: 90%;">
                   <pie-chart
                     v-if="element.type === 'pie'"
                     :title="element.title"
@@ -424,7 +424,7 @@
                       left: 15,
                       right: 15,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -433,7 +433,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <line-chart
@@ -448,7 +448,7 @@
                       left: 5,
                       right: 5,
                       bottom: 10,
-                      containLabel: true
+                      containLabel: true,
                     }"
                     :legend="{
                       itemWidth: 8,
@@ -457,7 +457,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '5'
+                      top: '5',
                     }"
                   />
                   <bar-chart-double
@@ -473,7 +473,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-vertical
@@ -488,7 +488,7 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <bar-chart-horizontal
@@ -504,12 +504,12 @@
                       orient: 'horizontal',
                       icon: 'roundRect',
                       left: '0',
-                      top: '10'
+                      top: '10',
                     }"
                   />
                   <scroll-table
                     v-if="element.type === 'rank-table'"
-                    style="width: 100%"
+                    style="width: 100%;"
                     :height="330"
                     :data="element.data"
                     :columns="element.columns"
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index f00fde5..8b2ab9b 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -716,18 +716,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   // if(index !== -1) {
   //   form.value.groupCodeName = useDeptList.value[index].name
   // }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/info/book/components/maintenanceRecord.vue b/src/views/equipement/info/book/components/maintenanceRecord.vue
index 17c9b06..34df225 100644
--- a/src/views/equipement/info/book/components/maintenanceRecord.vue
+++ b/src/views/equipement/info/book/components/maintenanceRecord.vue
@@ -21,7 +21,7 @@
   logNo: '', // 记录编号
   maintainType: '', // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4853aeb..fd6df96 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -35,7 +35,7 @@
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -163,7 +163,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -271,7 +271,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //	负责人id
     equipmentName: listQuery.value.equipmentName, //	设备名称
     equipmentNo: listQuery.value.equipmentNo, //	设备编号
@@ -305,7 +305,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index b527057..aa752b8 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -19,7 +19,7 @@
 // 查询条件
 const listQuery = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
-  groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+  groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
   directorId: '', //		负责人id
   equipmentName: '', //		设备名称
   equipmentNo: '', //		设备编号
@@ -109,7 +109,7 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
-    groupCode: '', // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: '', // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: '', //		负责人id
     equipmentName: '', //		设备名称
     equipmentNo: '', //		设备编号
@@ -164,7 +164,7 @@
     ids: checkoutList.value,
     pdf: false,
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-    groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     directorId: listQuery.value.directorId, //		负责人id
     equipmentName: listQuery.value.equipmentName, //		设备名称
     equipmentNo: listQuery.value.equipmentNo, //		设备编号
@@ -197,7 +197,7 @@
   if (list.value.length > 0) {
     const params = {
       approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
-      groupCode: listQuery.value.groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+      groupCode: listQuery.value.groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
       directorId: listQuery.value.directorId, //		负责人id
       equipmentName: listQuery.value.equipmentName, //		设备名称
       equipmentNo: listQuery.value.equipmentNo, //		设备编号
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index f3b506e..a397bf5 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -25,7 +25,7 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  // groupCode: '',	// 组别(字典code)
+  // groupCode: '',	// 部门(字典code)
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -55,12 +55,12 @@
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const labCodeList = ref<dictType[]>([]) // 实验室
-// const groupCodeList = ref<dictType[]>([]) // 组别
+// const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const deptList = ref<deptType[]>([]) // 所属部门列表
@@ -88,7 +88,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   // getDictByCode('bizGroupCode').then((response) => {
   //   groupCodeList.value = response.data
   // })
@@ -207,8 +207,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index fa5f21b..a052cd0 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -22,7 +22,7 @@
 
 export interface IForm {
   labCode: string // 实验室
-  // groupCode: string	// 组别(字典code)
+  // groupCode: string	// 部门(字典code)
   equipmentNo: string // 统一编号
   equipmentName: string // 设备名称
   model: string // 规格型号
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 1e03c4e..cb0a328 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -6,7 +6,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -30,7 +30,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index a675b65..1bb07ca 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -109,7 +109,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -117,7 +117,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 33c1e6d..4f75894 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -137,7 +137,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -186,7 +186,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/course/course-interface.ts b/src/views/equipement/resume/course/course-interface.ts
index b391137..57b8854 100644
--- a/src/views/equipement/resume/course/course-interface.ts
+++ b/src/views/equipement/resume/course/course-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string // 创建时间开始
   formNo: string // 检查单编号
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   draft: string // 是否为草稿箱(1/0)
   createUserId: string // 创建人id（草稿箱tab页必传）
   limit: number
@@ -24,8 +24,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 检查单编号
   formName: string // 检查单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/course/edit.vue b/src/views/equipement/resume/course/edit.vue
index 0a72344..e2db8a1 100644
--- a/src/views/equipement/resume/course/edit.vue
+++ b/src/views/equipement/resume/course/edit.vue
@@ -26,8 +26,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 检查单编号
   formName: '', // 检查单名称
   createUserId: '', // 创建人id
@@ -48,14 +48,14 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 // 获取字典值
 async function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -359,7 +359,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="部门" prop="groupCode">
-              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail'" class="full-width-input">
+              <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/equipement/resume/course/list.vue b/src/views/equipement/resume/course/list.vue
index 7e729ff..292b58a 100644
--- a/src/views/equipement/resume/course/list.vue
+++ b/src/views/equipement/resume/course/list.vue
@@ -23,7 +23,7 @@
   draft: '', // 是否为草稿箱(1/0)
   createUserId: '', // 创建人id（草稿箱tab页必传）
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -109,7 +109,7 @@
     createTimeStart: '', // 创建时间开始
     formNo: '', // 检查单编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     draft: '', // 是否为草稿箱(1/0)
     createUserId: '', // 创建人id（草稿箱tab页必传）
     limit: 20,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef5cdc6..482a351 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -27,8 +27,8 @@
 const ruleFormRef = ref() // 表单ref
 const form = ref<IForm>({
   labCode: '', // 实验室
-  groupCode: '',	// 组别(字典code)
-  groupCodeName: '',	// 组别(字典value)
+  groupCode: '',	// 部门(字典code)
+  groupCodeName: '',	// 部门(字典value)
   formNo: '', // 装箱单编号
   formName: '', // 装箱单名称
   createUserId: '', // 创建人id
@@ -48,7 +48,7 @@
 // -------------------------------------------字典------------------------------------------
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const transportTypeList = ref<dictType[]>([]) // 运输类型
 // 获取字典值
 async function getDict() {
@@ -57,7 +57,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 607e4da..8dbd066 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -4,7 +4,7 @@
   packingTimeEnd: string // 装箱时间结束
   packingTimeStart: string // 装箱时间开始
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   limit: number
   offset: number
 }
@@ -23,8 +23,8 @@
 // 详情表单
 export interface IForm {
   labCode: string // 实验室
-  groupCode: string // 组别(字典code)
-  groupCodeName: string // 组别(字典value)
+  groupCode: string // 部门(字典code)
+  groupCodeName: string // 部门(字典value)
   formNo: string // 装箱单编号
   formName: string // 装箱单名称
   createUserId: string // 创建人id
diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue
index 08d322b..51cdad2 100644
--- a/src/views/equipement/resume/encasement/list.vue
+++ b/src/views/equipement/resume/encasement/list.vue
@@ -20,7 +20,7 @@
   packingTimeStart: '', // 装箱时间开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   limit: 20,
   offset: 1,
 })
@@ -90,7 +90,7 @@
     packingTimeStart: '', // 装箱时间开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     limit: 20,
     offset: 1,
   }
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 79e9646..eca4dc5 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -79,7 +79,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labDeptList = ref<dictType[]>([]) // 实验室
-const useDeptList = ref<dictType[]>([]) // 组别
+const useDeptList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index db430ab..3177e98 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -7,7 +7,7 @@
   exceptionTimeEnd: string //	故障时间结束
   exceptionTimeStart: string //	故障时间开始
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   handleStatus: string //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: string //		实验室(字典code)
   manufactureNo: string //		出厂编号
diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue
index 9415288..0d38649 100644
--- a/src/views/equipement/resume/error/list.vue
+++ b/src/views/equipement/resume/error/list.vue
@@ -41,7 +41,7 @@
   exceptionTimeEnd: '', //	故障时间结束
   exceptionTimeStart: '', //	故障时间开始
   formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
   labCode: '', //		实验室(字典code)
   manufactureNo: '', //		出厂编号
@@ -151,7 +151,7 @@
     exceptionTimeEnd: '', //	故障时间结束
     exceptionTimeStart: '', //	故障时间开始
     formId: SCHEDULE.EXCEPTION_HANDLING_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别(字典code)
+    groupCode: '', //	部门(字典code)
     handleStatus: '', //	异常处置状态(异常处置申请通过/异常处置结果通过)
     labCode: '', //		实验室(字典code)
     manufactureNo: '', //		出厂编号
@@ -206,7 +206,7 @@
       exceptionTimeEnd: listQuery.value.exceptionTimeEnd, //	故障时间结束
       exceptionTimeStart: listQuery.value.exceptionTimeStart, //	故障时间开始
       formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       handleStatus: listQuery.value.handleStatus, //	异常处置状态(异常处置申请通过/异常处置结果通过)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
@@ -528,7 +528,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || ( row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
+                  v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || (row.approvalStatusName === '未通过' && row.handleStatus !== '异常处置申请通过'))"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index 4eab959..c371e36 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -41,7 +41,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   registerNo: '', // 登记表编号
   registerName: '', // 登记表名称
@@ -101,7 +101,7 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 function getDict() {
   // 实验室
@@ -109,7 +109,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index 65cab34..5d28d07 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -8,7 +8,7 @@
   registerNo: string // 登记表编号
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -34,7 +34,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   registerNo: string // 登记表编号
   registerName: string // 登记表名称
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index 090d352..1d80c04 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
   registerNo: '', // 登记表编号
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     registerNo: '', // 登记表编号
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       registerNo: listQuery.value.registerNo, // 登记表编号
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/month/list.vue b/src/views/equipement/resume/month/list.vue
index 06a04b6..f2e3cb6 100644
--- a/src/views/equipement/resume/month/list.vue
+++ b/src/views/equipement/resume/month/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 2, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -157,7 +157,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -181,7 +181,7 @@
       logNo: '', // 记录编号
       maintainType: 2, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -222,7 +222,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/unpack/components/basic.vue b/src/views/equipement/resume/unpack/components/basic.vue
index 092d981..0db5c2d 100644
--- a/src/views/equipement/resume/unpack/components/basic.vue
+++ b/src/views/equipement/resume/unpack/components/basic.vue
@@ -33,7 +33,7 @@
 const emits = defineEmits(['addSuccess', 'submitSuccess'])
 const user = useUserStore() // 用户信息
 const form = ref<IForm>({
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCode: '', // 实验室
   logNo: '', // 记录表编号
   logName: '', // 记录表名称
@@ -72,13 +72,13 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index fd0f4ed..7e142dd 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
   receiveTimeStart: '', // 验收日期开始
 
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   model: '', //		规格型号
   manufactureNo: '', //		出厂编号
   manufacturer: '', // 生产厂家
@@ -141,7 +141,7 @@
     receiveTimeStart: '', // 验收日期开始
 
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     model: '', //		规格型号
     manufactureNo: '', //		出厂编号
     manufacturer: '', // 生产厂家
@@ -192,7 +192,7 @@
       receiveTimeStart: listQuery.value.receiveTimeStart, // 验收日期开始
 
       labCode: listQuery.value.labCode, // 实验室
-      groupCode: listQuery.value.groupCode, // 组别、部门
+      groupCode: listQuery.value.groupCode, // 部门、部门
       model: listQuery.value.model, //		规格型号
       manufactureNo: listQuery.value.manufactureNo, //		出厂编号
       manufacturer: listQuery.value.manufacturer, // 生产厂家
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index a0ad2d7..423a8ca 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -8,7 +8,7 @@
   receiveTimeStart: string // 验收日期开始
 
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   model: string //		规格型号
   manufactureNo: string //		出厂编号
   manufacturer: string // 生产厂家
@@ -32,7 +32,7 @@
 }
 
 export interface IForm {
-  groupCode: string // 组别
+  groupCode: string // 部门
   labCode: string // 实验室
   logNo: string // 记录表编号
   logName: string // 记录表名称
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 704a8df..ae60fed 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -46,8 +46,8 @@
   logName: '', //		文件编号
   labCode: '', //		实验室(字典code)
   labCodeName: '', //		实验室(字典value)
-  groupCode: '', //		组别(字典code)
-  groupCodeName: '', //		组别(字典value)
+  groupCode: '', //		部门(字典code)
+  groupCodeName: '', //		部门(字典value)
   createTime: '', //		记录时间
   createUserId: '', //		记录人id
   createUserName: '', //		记录人
diff --git a/src/views/equipement/resume/week/list.vue b/src/views/equipement/resume/week/list.vue
index 1366edf..0981841 100644
--- a/src/views/equipement/resume/week/list.vue
+++ b/src/views/equipement/resume/week/list.vue
@@ -26,7 +26,7 @@
   logNo: '', // 记录编号
   maintainType: 1, // 保养类型 1 周维护/2 月保养
   equipmentId: '', //	设备台账id
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   limit: 20,
   offset: 1,
@@ -37,7 +37,7 @@
   directorName: '', //	负责人名字（来自人员登记）
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
-  groupCode: '', //	组别(字典code)
+  groupCode: '', //	部门(字典code)
   labCode: '', //	实验室(字典code)
   model: '',
   manufactureNo: '', //	出厂编号
@@ -168,7 +168,7 @@
       directorName: '', //	负责人名字（来自人员登记）
       equipmentName: '', //	设备名称
       equipmentNo: '', //	设备编号
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       model: '',
       manufactureNo: '', //	出厂编号
@@ -192,7 +192,7 @@
       logNo: '', // 记录编号
       maintainType: 1, // 保养类型 1 周维护/2 月保养
       equipmentId: '', //	设备台账id
-      groupCode: '', //	组别(字典code)
+      groupCode: '', //	部门(字典code)
       labCode: '', //	实验室(字典code)
       limit: 20,
       offset: 1,
@@ -233,7 +233,7 @@
       logNo: listQuery.value.logNo, // 记录编号
       maintainType: listQuery.value.maintainType, // 保养类型 1 周维护/2 月保养
       equipmentId: listQuery.value.equipmentId, //	设备台账id
-      groupCode: listQuery.value.groupCode, //	组别(字典code)
+      groupCode: listQuery.value.groupCode, //	部门(字典code)
       labCode: listQuery.value.labCode, //	实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/equipement/resume/week/week-interface.ts b/src/views/equipement/resume/week/week-interface.ts
index c4384e0..dbf13ef 100644
--- a/src/views/equipement/resume/week/week-interface.ts
+++ b/src/views/equipement/resume/week/week-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //	记录时间开始
   createUserName: string //	记录人
   equipmentId: string //	设备台账id
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   logNo: string //	记录编号
   maintainType: number //	保养类型(1 周维护/2 月保养)
@@ -18,7 +18,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   model: string
-  groupCode: string //	组别(字典code)
+  groupCode: string //	部门(字典code)
   labCode: string //	实验室(字典code)
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -61,8 +61,8 @@
   folderCheckRemark?: string //		备附件和资料检查备注
   functionCheck?: number //		设备功能、性能检查(1正常0不正常)
   functionCheckRemark?: string //		设备功能、性能检查备注
-  groupCode: string //		组别(字典code)
-  groupCodeName: string //		组别(字典value)
+  groupCode: string //		部门(字典code)
+  groupCodeName: string //		部门(字典value)
   id: string //		id，更新/删除使用参数
   ignored?: number //		本次是否已忽略(1/0)
   labCode: string //		实验室(字典code)
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0818978..0f999ea 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -42,13 +42,13 @@
 const form = ref<IForm>({
   id: '', // 列表id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   planNo: '', // 计划表编号
   planName: '', // 计划表名称
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
 
   applyTraceDate: '', // 申请溯源时间
@@ -116,9 +116,9 @@
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const planGroupList = ref<dictType[]>([]) // 计划表组别
+const planGroupList = ref<dictType[]>([]) // 计划表部门
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 
 // 查询字典
@@ -134,7 +134,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -249,7 +249,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -617,7 +617,7 @@
     equipmentNo: '', //		设备编号
     formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     labCode, // 实验室
-    groupCode, // 组别--后台定义用此字段筛选部门（刘翔）
+    groupCode, // 部门--后台定义用此字段筛选部门（刘翔）
     manufactureNo: '', //		出厂编号
     measureValidDateStart: '', //		检定有效期开始
     measureValidDateEnd: `${planYear}-12-31`, //		检定有效期结束
diff --git a/src/views/equipement/source/plan/list.vue b/src/views/equipement/source/plan/list.vue
index ed2ae74..587bb9d 100644
--- a/src/views/equipement/source/plan/list.vue
+++ b/src/views/equipement/source/plan/list.vue
@@ -40,7 +40,7 @@
   planName: '', // 文件名称
   planNo: '', // 文件编号
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门、
+  groupCode: '', // 部门、部门、
   planYear: '', // 年度
   planStatus: '', // 溯源计划状态
   limit: 20,
@@ -146,7 +146,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: '', // 年度
     planStatus: '', // 溯源计划状态
     limit: 20,
@@ -192,7 +192,7 @@
       createTimeStart: listQuery.value.createTimeStart, //		创建时间开始
       createUserName: listQuery.value.createUserName, //		创建人
       formId: listQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-      groupCode: listQuery.value.groupCode, //		组别(字典code)
+      groupCode: listQuery.value.groupCode, //		部门(字典code)
       labCode: listQuery.value.labCode, //		实验室(字典code)
       planName: listQuery.value.planName, //		计划表名称
       planNo: listQuery.value.planNo, //		计划表编号
diff --git a/src/views/equipement/source/plan/plan-interface.ts b/src/views/equipement/source/plan/plan-interface.ts
index 9c614d5..aa50540 100644
--- a/src/views/equipement/source/plan/plan-interface.ts
+++ b/src/views/equipement/source/plan/plan-interface.ts
@@ -4,7 +4,7 @@
   createTimeStart: string //		创建时间开始
   createUserName: string //		创建人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   planName: string //		计划表名称
   planNo: string //		计划表编号
@@ -29,13 +29,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   planNo: string // 计划表编号
   planName: string // 计划表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   [key: string]: string | undefined
 }
diff --git a/src/views/equipement/source/resultComplete/components/basic.vue b/src/views/equipement/source/resultComplete/components/basic.vue
index 1aecab2..e18fc4c 100644
--- a/src/views/equipement/source/resultComplete/components/basic.vue
+++ b/src/views/equipement/source/resultComplete/components/basic.vue
@@ -44,7 +44,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  formGroup: '', // 计划表组别
+  formGroup: '', // 计划表部门
   formYear: '', // 计划表年份
 })
 
diff --git a/src/views/equipement/source/resultComplete/resultComplete-interface.ts b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
index 6c280ed..da1a623 100644
--- a/src/views/equipement/source/resultComplete/resultComplete-interface.ts
+++ b/src/views/equipement/source/resultComplete/resultComplete-interface.ts
@@ -28,13 +28,13 @@
 export interface IForm {
   id: string // 列表id
   labCode: string // 实验室
-  groupCode: string // 组别
+  groupCode: string // 部门
   formNo: string // 情况表编号
   formName: string // 情况表名称
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  formGroup: string // 计划表组别
+  formGroup: string // 计划表部门
   formYear: string // 计划表年份
 }
 
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index 42524b8..c70859b 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -47,7 +47,7 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人
   createTime: '', // 创建时间
-  planGroup: '', // 计划表组别
+  planGroup: '', // 计划表部门
   planYear: '', // 计划表年份
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结果确认结论(计量标识字典code)
+  conclusion: '', // 结论(计量标识字典code)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(计量标识字典value)
+  meterIdentifyName: '', // 结果确认结论(输入框)
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -106,7 +106,7 @@
   // equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
   denyInfo: [{ required: true, message: '否则列出不能为空', trigger: ['blur', 'change'] }],
   // labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  // groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  // groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }],
   planGroup: [{ required: true, message: '组不能为空', trigger: ['blur', 'change'] }],
   measureCategory: [{ required: true, message: '证书类型不能为空', trigger: ['blur', 'change'] }],
@@ -131,7 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -145,7 +146,7 @@
 
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
 const measureCategoryList = ref<dictType[]>([]) // 证书类型(即检校类别)
 
@@ -159,7 +160,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -608,7 +609,7 @@
     form.value.labCodeName = route.query.labCodeName as string // 实验室名称
     form.value.groupCode = route.query.groupCode as string // 部门
     form.value.groupCodeName = route.query.groupCodeName as string // 部门名称
-    form.value.planGroup = route.query.planGroup as string // 计划表组别
+    form.value.planGroup = route.query.planGroup as string // 计划表部门
     form.value.planYear = route.query.planYear as string // 计划表年份
     form.value.equipmentId = route.query.equipmentId as string // 设备id
     form.value.equipmentNo = route.query.equipmentNo as string // 统一编号
@@ -1112,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="meterIdentify">
+            <el-form-item label="结论:" prop="conclusion">
               <el-select
-                v-model="form.meterIdentify"
+                v-model="form.conclusion"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1348,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="conclusion">
+            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
               <el-input
-                v-model="form.conclusion"
+                v-model="form.meterIdentifyName"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index be68a69..6b8abdb 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -45,7 +45,7 @@
   equipmentName: '', //	设备名称
   equipmentNo: '', //	设备编号
   formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //	组别
+  groupCode: '', //	部门
   labCode: '', //	实验室
   manufactureNo: '', //	出厂编号
   manufacturer: '', //	生产厂家
@@ -275,7 +275,7 @@
     equipmentName: '', //	设备名称
     equipmentNo: '', //	设备编号
     formId: SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //	组别
+    groupCode: '', //	部门
     labCode: '', //	实验室
     manufactureNo: '', //	出厂编号
     manufacturer: '', //	生产厂家
@@ -336,7 +336,7 @@
         equipmentName: listQuery.value.equipmentName, //	设备名称
         equipmentNo: listQuery.value.equipmentNo, //	设备编号
         formId: listQuery.value.formId, //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-        groupCode: listQuery.value.groupCode, //	组别
+        groupCode: listQuery.value.groupCode, //	部门
         labCode: listQuery.value.labCode, //	实验室
         manufactureNo: listQuery.value.manufactureNo, //	出厂编号
         manufacturer: listQuery.value.manufacturer, //	生产厂家
@@ -427,7 +427,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
@@ -503,7 +503,7 @@
           labCodeName: row.labCodeName, // 实验室名称
           groupCode: row.groupCode, // 部门
           groupCodeName: row.groupCodeName, // 部门名称
-          planGroup: row.planGroup, // 计划表组别
+          planGroup: row.planGroup, // 计划表部门
           planYear: row.planYear, // 计划表年份
           equipmentId: row.equipmentId, // 设备id
           equipmentNo: row.equipmentNo, // 统一编号
diff --git a/src/views/equipement/source/resultConfirm/planDetail.vue b/src/views/equipement/source/resultConfirm/planDetail.vue
index 47580dd..4df76cd 100644
--- a/src/views/equipement/source/resultConfirm/planDetail.vue
+++ b/src/views/equipement/source/resultConfirm/planDetail.vue
@@ -14,7 +14,7 @@
 const form = ref({
   planYear: '', // 年度
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   equipmentId: '', // 设备id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -46,7 +46,7 @@
 }
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 // 查询字典
 const getDict = async () => {
@@ -54,7 +54,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -73,7 +73,7 @@
     planName: '', // 文件名称
     planNo: '', // 文件编号
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门、
+    groupCode: '', // 部门、部门、
     planYear: year, // 年度
     planStatusName: '', // 溯源计划状态
     limit: 20,
@@ -116,7 +116,7 @@
         sourceNeedlist.value = equipmentInfo.technicalTargetList
       }
       form.value.labCode = res.data.labCode // 实验室
-      form.value.groupCode = res.data.groupCode // 组别
+      form.value.groupCode = res.data.groupCode // 部门
       form.value.directorName = route.query.directorName as string // 负责人
     }
   })
diff --git a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
index 371cb23..dc18d4d 100644
--- a/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
+++ b/src/views/equipement/source/resultConfirm/resultConfirm-interface.ts
@@ -8,7 +8,7 @@
   equipmentName: string //	设备名称
   equipmentNo: string //	设备编号
   formId: string //	表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //	组别
+  groupCode: string //	部门
   labCode: string //	实验室
   manufactureNo: string //	出厂编号
   manufacturer: string //	生产厂家
@@ -50,7 +50,7 @@
   labCodeName?: string // 实验室名称
   groupCode?: string // 部门
   groupCodeName?: string // 部门名称
-  planGroup?: string // 计划表组别
+  planGroup?: string // 计划表部门
   planYear?: string // 计划表年份
   manufactureNo?: string // 出厂编号
   manufacturer?: string // 生产厂家
@@ -71,7 +71,7 @@
   createUserId: string // 创建人id
   createUserName: string // 创建人
   createTime: string // 创建时间
-  planGroup: string // 计划表组别
+  planGroup: string // 计划表部门
   planYear: string // 计划表年份
   equipmentId: string // 设备id
   equipmentNo: string // 统一编号
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 43eaa99..d13ae80 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -3,7 +3,7 @@
   approvalStatus: string //	审批状态类型code，导出接口不用传
   deptId: string //		部门id
   formId: string // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string // 	组别
+  groupCode: string // 	部门
   inUseStatus: string //	在用状态
   labCode: string //	实验室名称
   lastChangeDateStart: string //	最近变更日期开始
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index fffb770..2ec3e36 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -793,18 +793,18 @@
 const changeGroupCode = (groupCode: any) => {
   console.log('bizLabCode', user.bizLabCode)
   console.log('groupNo', user.groupNo)
-  console.log('注意：此用户没有实验室或者组别')
+  console.log('注意：此用户没有实验室或者部门')
   const index = useDeptList.value.findIndex(item => item.value === groupCode)
   if (index !== -1) {
     form.value.groupCodeName = useDeptList.value[index].name
   }
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${groupCode}` !== '') {
-    // 通过实验室组别获取部门id、并赋值给deptId
+    // 通过实验室部门获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, groupCode)
   }
 }
 
-// 根据实验室代码和组别获取deptId
+// 根据实验室代码和部门获取deptId
 function fetchDeptIdByLabAndGroup(labCode: string, groupNo: string) {
   getDeptIdByLabAndGroup({ labCode, groupNo }).then((res) => {
     form.value.deptId = res.data.deptId
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 68e30fb..ee70078 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -52,8 +52,8 @@
 const voltage = ref(true) // 是否显示直流电压
 const columns = ref<TableColumn[]>([ // 表头
   { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' },
-  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, width: '180' },
+  { text: '单位', value: 'unit', align: 'center', required: true, width: '180' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' },
   { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' },
@@ -156,7 +156,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
-      id: item.id.includes('custom') ? '' : item.id,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   const tempResistanceList = listResistance.value.map((item) => {
@@ -164,6 +164,7 @@
       ...item,
       checkType: item.checkType.join(','), // 核查类型
       remark: form.value.remark,
+      id: item.id!.includes('custom') ? '' : item.id,
     }
   })
   // 只有选中显示表格才去传
diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue
index b89b794..0f3cf3c 100644
--- a/src/views/equipement/standard/book/components/project.vue
+++ b/src/views/equipement/standard/book/components/project.vue
@@ -35,7 +35,7 @@
 const checkoutList = ref([]) as any // 多选数据
 const checkoutIds = ref<string[]>([])// 删除用的ids
 const columns = ref<TableColumn[]>([ // 表头
-  { text: '检定或校准项目名称', value: 'itemName', align: 'center', required: true },
+  { text: '开展量传参数名称', value: 'itemName', align: 'center', required: true },
   { text: '持有该参数人员', value: 'personList', align: 'center' },
 ])
 const total = ref(0) // 数据总条数
@@ -260,7 +260,7 @@
             v-if="item.value === 'itemName' && pageType !== 'detail'"
             v-model="scope.row[item.value]"
             filterable
-            :placeholder="pageType === 'detail' ? ' ' : '请选择检定或校准项目名称'"
+            :placeholder="pageType === 'detail' ? ' ' : '请选择开展量传参数名称'"
             :disabled="pageType === 'detail'"
             class="full-width-input"
             @change="(selectedValue: any) => changeItemName(selectedValue, scope.row, scope.$index)"
diff --git a/src/views/equipement/standard/book/components/standard.vue b/src/views/equipement/standard/book/components/standard.vue
index df81158..ddbfc61 100644
--- a/src/views/equipement/standard/book/components/standard.vue
+++ b/src/views/equipement/standard/book/components/standard.vue
@@ -12,6 +12,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { getUid } from '@/utils/getUid'
 import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book'
+import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { useMergeCells } from '@/commonMethods/useMergeCells'
 import type { IList, IListQuery } from '@/views/equipement/standard/checkItemClassification/checkItemClassification-interface'
 import { getCheckItemClassificationList } from '@/api/equipment/standard/checkItemClassification'
@@ -126,9 +127,11 @@
   })
 }
 
+const scanEquipmentRef = ref()
 // 点击标签识读
 const scan = () => {
-  ElMessage.info('敬请期待')
+  // 参数：是标签绑定
+  scanEquipmentRef.value.initDialog(false)
 }
 // 点击批量增加
 const multiAdd = () => {
@@ -570,4 +573,6 @@
   <select-equipment-dialog ref="equipmentRef" :is-multi="isMulti" @confirm="confirmSelect" />
   <!-- 选择核查项  -->
   <select-check-item ref="selectCheckItemRef" @confirm="confirmSelectCheckItem" />
+
+  <scan-equipment-dialog ref="scanEquipmentRef" title="标签识读" />
 </template>
diff --git a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
index a7fd4da..a18861a 100644
--- a/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectPersonProjectDialog.vue
@@ -25,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '检定或校准项目名称', value: 'name', align: 'center', width: '160' },
+  { text: '开展量传参数名称', value: 'name', align: 'center', width: '160' },
   { text: '持有该参数人员', value: 'staffName', align: 'center' },
 ])
 
@@ -77,7 +77,7 @@
 // 点击确定
 const confirmSelect = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择检定或校准项目')
+    ElMessage.warning('请选择开展量传参数')
   }
   else {
     emits('confirm', checkoutList.value)
@@ -97,11 +97,11 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择检定或校准项目" width="65%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择开展量传参数" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input v-model="filterItem" placeholder="检定或校准项目名称" clearable />
+        <el-input v-model="filterItem" placeholder="开展量传参数名称" clearable />
       </search-item>
     </search-area>
 
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index cea1831..0e26392 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -19,7 +19,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -99,7 +99,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue
index f76a284..11faeed 100644
--- a/src/views/equipement/standard/book/list.vue
+++ b/src/views/equipement/standard/book/list.vue
@@ -35,7 +35,7 @@
   approvalStatus: active.value, //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -160,7 +160,7 @@
     approvalStatus: active.value, //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
@@ -224,7 +224,7 @@
     approvalStatus: listQuery.value.approvalStatus, //	审批状态类型code，导出接口不用传
     deptId: listQuery.value.deptId, //		部门id
     formId: listQuery.value.formId, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: listQuery.value.groupCode, // 	组别
+    groupCode: listQuery.value.groupCode, // 	部门
     inUseStatus: listQuery.value.inUseStatus, //	在用状态
     labCode: listQuery.value.labCode, //	实验室名称
     lastChangeDateStart: listQuery.value.lastChangeDateStart, //	最近变更日期开始
diff --git a/src/views/equipement/standard/build/build-interface.ts b/src/views/equipement/standard/build/build-interface.ts
index d8b4da3..a1be6c0 100644
--- a/src/views/equipement/standard/build/build-interface.ts
+++ b/src/views/equipement/standard/build/build-interface.ts
@@ -12,7 +12,7 @@
   createTimeStart: string //		申请时间开始
   createUserName: string //		申请人
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   standardName: string //		标准装置名称
   limit: number
diff --git a/src/views/equipement/standard/build/components/basic.vue b/src/views/equipement/standard/build/components/basic.vue
index 542ab19..059a3a3 100644
--- a/src/views/equipement/standard/build/components/basic.vue
+++ b/src/views/equipement/standard/build/components/basic.vue
@@ -78,7 +78,7 @@
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const buildTypeList = ref<dictType[]>([]) // 标准建立类型
 const bizMajorTypeList = ref<dictType[]>([]) // 专业类别
 function getDict() {
@@ -90,7 +90,7 @@
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别/部门
+  // 部门/部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -504,7 +504,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="部门" prop="groupCode" @click="changeSelectGroup">
-            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.groupCode" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -521,7 +521,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专业类别" prop="majorType">
-            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择组别'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
+            <el-select v-model="form.majorType" :placeholder="pageType === 'detail' ? ' ' : '请选择部门'" :disabled="pageType === 'detail' || form.buildType !== '0'" class="full-width-input">
               <el-option v-for="item in bizMajorTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/equipement/standard/build/list.vue b/src/views/equipement/standard/build/list.vue
index a2865f2..bf71ba7 100644
--- a/src/views/equipement/standard/build/list.vue
+++ b/src/views/equipement/standard/build/list.vue
@@ -40,7 +40,7 @@
   createTimeStart: '', //		申请时间开始
   createUserName: '', //		申请人
   formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   standardName: '', //		标准装置名称
   limit: 20,
@@ -146,7 +146,7 @@
     createTimeStart: '', //		申请时间开始
     createUserName: '', //		申请人
     formId: SCHEDULE.STANDARD_SETUP_APPROVAL, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     standardName: '', //		标准装置名称
     limit: 20,
diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
index c1b82f1..d878c93 100644
--- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue
@@ -257,8 +257,13 @@
   loading.close()
   if (!res.data) {
     emits('isConfigCheck', false)
+    originList.value = []
+    listRepeatability.value = []
+    // 稳定性
+    listStability.value = []
   }
   else {
+    emits('isConfigCheck', true)
     originList.value = res.data.checkItemDataLowerPowerList
     if (solveData) {
       handleData(res.data.checkItemDataLowerPowerList)
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 4ba86f3..55435fd 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -5,6 +5,7 @@
 import dayjs from 'dayjs'
 import type { IDetailCheckData, IEquipmentList, IForm } from './checkData-interface'
 import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
+import categoryNameDict from '/public/config/categoryNameDict.json'
 import saveCheckRecord from './dialog/saveCheckRecord.vue'
 import checkDataFirst from './components/first/checkDataCom.vue'
 import checkDataSecond from './components/second/checkDataCom.vue'
@@ -254,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { file: string }) => item.file)
+    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -951,12 +952,12 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       console.log('实验室', user.bizLabCode)
-      console.log('组别', user.groupNo)
+      console.log('部门', user.groupNo)
 
       const params = {
         ...solvedParams,
         labCode: user.bizLabCode, // 实验室
-        groupCode: user.groupNo, // 组别
+        groupCode: user.groupNo, // 部门
         recordName: `${solvedParams.equipmentInfo.equipmentName}-${solvedParams.checkDate}`, // 核查记录报告名称
         dataId: solvedParams.id, // 核查记录id
         checkDateId: solvedParams.id, // 核查记录id
@@ -982,7 +983,7 @@
         loading.close()
       })
     }
-    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入组别、实验实验室称
+    // saveMeasureCertificateRef.value.initDialog(params) // 弹窗输入部门、实验实验室称
   }
 }
 
diff --git a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
index 4f40404..1d154dd 100644
--- a/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
+++ b/src/views/equipement/standard/checkData/dialog/saveCheckRecord.vue
@@ -11,7 +11,7 @@
 const dialogVisible = ref(false) // 弹窗显示状态
 const form = ref({ // 默认表单
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   recordName: '', // 核查记录名称
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -20,12 +20,12 @@
 const dialogLoading = ref(false) // 弹窗loading
 // -----------------------------------------字典--------------------------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 async function getDict() {
   // 实验室
   const res = await getDictByCode('bizLabCode')
   labCodeList.value = res.data
-  // 组别
+  // 部门
   const response = await getDictByCode('bizGroupCode')
   groupCodeList.value = response.data
 }
@@ -33,7 +33,7 @@
 const dataFormRef = ref<FormInstance>() // 表单对象
 const rules = reactive<FormRules>({ // 校验规则
   labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['blur', 'change'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
   recordName: [{ required: true, message: '核查记录名称不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -119,8 +119,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="组别" prop="groupCode">
-        <el-select v-model="form.groupCode" placeholder="请选择组别" class="full-width-input">
+      <el-form-item label="部门" prop="groupCode">
+        <el-select v-model="form.groupCode" placeholder="请选择部门" class="full-width-input">
           <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index b8552fc..4545e2a 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -26,7 +26,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -131,7 +131,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
index 9558496..7a37a44 100644
--- a/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/standardStateMaintenance/commonComponents/basic.vue
@@ -75,7 +75,7 @@
   applyIllustrate: '', // 申请说明
   applyFile: '', // 申请附件
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   labCodeName: '', // 实验室名称
   groupCodeName: '', // 部门代码
   standardCertNo: '', // 计量标准证书号
@@ -99,13 +99,13 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index f353f1d..3d8dbba 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -34,7 +34,7 @@
   approvalStatus: '0', // 审批状态
   deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -107,7 +107,7 @@
     approvalStatus: '0', // 审批状态
     deptId: props.isSelectDeptId ? user.deptId : '', // 部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
index 7033ad6..82c8d37 100644
--- a/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
+++ b/src/views/equipement/standardStateMaintenance/standardStateMaintenance-interface.ts
@@ -46,7 +46,7 @@
   applyIllustrate: string // 申请说明
   applyFile?: string // 申请附件
   labCode?: string // 实验室
-  groupCode?: string // 组别
+  groupCode?: string // 部门
   labCodeName?: string // 实验室名称
   groupCodeName?: string // 部门代码
   standardCertNo?: string // 计量标准证书号
diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
index 7ded4e4..eb245ea 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue
@@ -59,7 +59,7 @@
   approvalType: props.approvalType, // 申请类型(字典code)
   formId: props.formId, // 表单id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   model: '', // 规格型号
   manufactureNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index 8015886..733eba3 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -23,7 +23,7 @@
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   deptId: '', //		部门id
   formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   inUseStatus: '', //	在用状态
   labCode: '', //	实验室名称
   lastChangeDateStart: '', //	最近变更日期开始
@@ -159,7 +159,7 @@
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     deptId: '', //		部门id
     formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     inUseStatus: '', //	在用状态
     labCode: '', //	实验室名称
     lastChangeDateStart: '', //	最近变更日期开始
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index 825348f..df15760 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -34,8 +34,8 @@
 const form = ref<IForm>({
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
-  groupCode: '', // 组别
-  groupCodeName: '', // 组别名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   formNo: '', //		文件编号
   formName: '', //		文件名称
   createUserId: '', //		创建人id
@@ -67,14 +67,14 @@
 })
 // ------------------------------------------字典----------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/customer/contract/contract-interface.ts b/src/views/resource/customer/contract/contract-interface.ts
index 3faa1d2..b5d1d98 100644
--- a/src/views/resource/customer/contract/contract-interface.ts
+++ b/src/views/resource/customer/contract/contract-interface.ts
@@ -12,7 +12,7 @@
   examineNo: string //		合同评审表编号
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		文件编号
-  groupCode: string //		组别
+  groupCode: string //		部门
   labCode: string //		实验室
   sendStatus: string //		通知发送状态(1/2)
   offset: number
diff --git a/src/views/resource/customer/contract/list.vue b/src/views/resource/customer/contract/list.vue
index b3cb72d..b1be17c 100644
--- a/src/views/resource/customer/contract/list.vue
+++ b/src/views/resource/customer/contract/list.vue
@@ -32,7 +32,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -152,7 +152,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -208,7 +208,7 @@
           processId: row.processId, // 流程实例id
           taskId: row.taskId, // 任务id
           labCode: row.labCode, // 实验室
-          groupCode: row.groupCode, // 组别
+          groupCode: row.groupCode, // 部门
           formNo: row.formNo, // 申请单编号
           formName: row.formName, // 申请单名称
           createUserId: row.createUserId, // 创建人id
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 995868c..dae136a 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -61,6 +61,32 @@
   })
 }
 
+const refCustomerStaffFilter = ref()
+
+// 点击 发送 按钮
+const sendToCustomer = () => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
+}
+
+const sysUserSelectedHandler = (row: any) => {
+  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
+  if (row.id !== '') {
+    sendTo({ id: infoId.value, signUserId: row.id, customerId: row.deptId }).then((res) => {
+      if (res.code === 200) {
+        // 提示保存成功
+        ElMessage.success(`通知单发送到送检单位 ${row.customerName} 的 ${row.name} 成功`)
+      }
+      else {
+        // 提示失败信息
+        ElMessage.error(`通知单发送至送检单位失败：${res.message}`)
+      }
+    })
+  }
+  else {
+    ElMessage.error('发送给委托方人员不能为空，请重新选择')
+  }
+}
+
 onMounted(() => {
   infoId.value = $route.query.id as string
   init()
@@ -71,7 +97,14 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
+<<<<<<< HEAD
+        <el-button type="primary" @click="sendToCustomer">
+          发送给委托方
+        </el-button>
+        <el-button type="primary" @click="exportWord">
+=======
         <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord">
+>>>>>>> b08463a2abbc5880b94ba6b2553aa23f4f53b12a
           导出word
         </el-button>
         <el-button  type="primary" @click="exportPdf">
@@ -88,5 +121,6 @@
     <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
       <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
+    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和具体人员" @record-selected="sysUserSelectedHandler" />
   </app-container>
 </template>
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 1b2eac4..8dcf9e3 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -106,7 +106,7 @@
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   customerContent: [{ required: true, message: '委托方信息不能为空', trigger: 'blur' }],
   measureItem: [{ required: true, message: '测试、校准或检定项目不能为空', trigger: 'blur' }],
   otherRequire: [{ required: true, message: '其他要求不能为空', trigger: 'blur' }],
@@ -593,6 +593,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
+    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -626,8 +627,6 @@
     case 'update':
       title.value = '要求、委托书及合同评审表（编辑）'
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 判断显示哪些流程操作按钮
       showOperationButtonByStatus()
@@ -638,8 +637,6 @@
       title.value = '要求、委托书及合同评审表'
       id.value = params.id
       fetchExamineDetail()
-      // examineInfo.value = JSON.parse(sessionStorage.getItem('examineInfo')!)
-      measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
 
       // 查看详情时所有的操作按钮都隐藏
       showOperationButtonByStatus()
@@ -765,8 +762,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="examineInfo.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="examineInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
                 <el-input v-model="examineInfo.groupCodeName" type="hidden" />
@@ -926,7 +923,7 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :clearable="true" :disabled="type === 'detail'">
+                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 6280e14..b41af93 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,6 +1,6 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs, ElLoading } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -578,7 +578,7 @@
       noticeInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       noticeInfo.value.noticeDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验室代码可以编辑
+      // 新建时部门和实验室代码可以编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 9413689..902da71 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -271,7 +271,7 @@
       reportInfo.value.createUserName = userInfo.name
       reportInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
-      // 新建时组别和实验实验室编辑
+      // 新建时部门和实验实验室编辑
       keyFieldsDisable.value = false
       break
     case 'update':
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index 8c34ba6..1f65b33 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -5,6 +5,7 @@
 import ConditionDialog from './dialog/conditionDialog.vue'
 import SelectLabRoomsDialog from './dialog/selectLabRoomsDialog.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
+import { getLocationList } from '@/api/business/taskMeasure/measureData'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
@@ -379,6 +380,7 @@
 }
 getDictFun()
 // ------------------------------------------选择工作间--------------------------------------------------------
+const workRoomList = ref([]) // 工作间列表
 const selectLabRoomsRef = ref()
 // 点击选择工作间
 const selectLabRooms = () => {
@@ -391,9 +393,35 @@
     detailRequire.value.workRoom = val[0].locationName
   }
 }
+
+// 请求工作间
+const fetchLocationList = () => {
+  const params = {
+    locationName: '', // 地点名称
+    locationNo: '', // 地点编号
+    labName: '', // 所属实验室
+    limit: 20,
+    offset: 1,
+  }
+  getLocationList(params).then((response) => {
+    workRoomList.value = response.data.rows.map((item: { locationName: string }) => {
+      return {
+        value: item.locationName,
+      }
+    })
+  })
+}
+
+// 匹配辅助字段输入建议
+const querySearchWorkRoom = (queryString: string, cb: any) => {
+  const results = queryString ? workRoomList.value.filter((item: any) => item.value.includes(queryString)) : workRoomList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
 // -------------------------------------------------------------------------------------------------------
 onMounted(() => {
   initDict()
+  fetchLocationList() // 获取工作间数据
   initDialog(route.query)
 })
 </script>
@@ -467,16 +495,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工作间名称" prop="workRoom">
-              <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
+              <!-- <el-input v-model="detailRequire.workRoom" :disabled="true" placeholder="请选择工作间">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="selectLabRooms">
                     选择
                   </el-button>
                 </template>
-              </el-input>
+              </el-input> -->
+              <el-autocomplete
+                v-model="detailRequire.workRoom"
+                :fetch-suggestions="querySearchWorkRoom"
+                placeholder="工作间名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
diff --git a/src/views/resource/file/approval/dialog/editFileItemDialog.vue b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
index 4fc475a..be31416 100644
--- a/src/views/resource/file/approval/dialog/editFileItemDialog.vue
+++ b/src/views/resource/file/approval/dialog/editFileItemDialog.vue
@@ -53,7 +53,7 @@
 })
 // // -------------------------------------------字典------------------------------------------
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 const fileTypeList = ref<dictType[]>([]) // 文件类型
 const staffUserList = ref<dictType[]>([]) // 计量人员
 // 获取字典值
@@ -62,7 +62,7 @@
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
@@ -205,7 +205,7 @@
   fileRef.click()
 }
 // ---------------------------------------------钩子、事件-----------------------------------------
-// 修改组别
+// 修改部门
 const changeGroupCode = (val: string) => {
   const index = groupCodeList.value.findIndex(item => item.value === val)
   if (index !== -1) {
diff --git a/src/views/resource/file/change/dialog/selectSysFileDialog.vue b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
index 7d3cbca..79bb148 100644
--- a/src/views/resource/file/change/dialog/selectSysFileDialog.vue
+++ b/src/views/resource/file/change/dialog/selectSysFileDialog.vue
@@ -22,7 +22,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -106,7 +106,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
index 41ce242..afdeb0a 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue
@@ -30,7 +30,7 @@
   examineName: '', //		合同评审表名称
   examineNo: '', //		合同评审表编号
   formNo: '', //		文件编号
-  groupCode: '', //		组别
+  groupCode: '', //		部门
   labCode: '', //		实验室
   sendStatus: '', //		通知发送状态(1/2)
   formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
@@ -117,7 +117,7 @@
     examineName: '', //		合同评审表名称
     examineNo: '', //		合同评审表编号
     formNo: '', //		文件编号
-    groupCode: '', //		组别
+    groupCode: '', //		部门
     labCode: '', //		实验室
     sendStatus: '', //		通知发送状态(1/2)
     formId: SCHEDULE.CONTRACT_EXECUTE_CHANGE, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 7af142f..f38d52c 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -46,7 +46,7 @@
 
 const methodConfirmRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放号不能为空', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '检测或校准方法不能为空，请选择', trigger: 'blur' }],
   measureItem: [{ required: true, message: '检测或校准项目不能为空', trigger: 'blur' }],
@@ -640,9 +640,9 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
+              <el-form-item label="部门" prop="groupCode">
                 <el-select
-                  v-model="methodConfirm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable"
+                  v-model="methodConfirm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable"
                   style="width: 100%;"
                 >
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index cbfcef7..cd564db 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -53,7 +53,7 @@
 const listQueryLeft = ref({
   approvalStatus: '0', //	审批状态类型code，导出接口不用传
   formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-  groupCode: '', // 	组别
+  groupCode: '', // 	部门
   labCode: '', //	实验室名称
   formNo: '', // 文件编号
   formName: '', // 文件名称
@@ -143,7 +143,7 @@
   listQueryLeft.value = {
     approvalStatus: '0', //	审批状态类型code，导出接口不用传
     formId: SCHEDULE.NOVELTY_SEARCH_RECORD_LIST_APPROVAL,
-    groupCode: '', // 	组别
+    groupCode: '', // 	部门
     labCode: '', //	实验室名称
     formNo: '', // 文件编号
     formName: '', // 文件名称
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index 1c34a8a..19bdf70 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -47,7 +47,7 @@
 
 const noveltyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   noveltyDate: [{ required: true, message: '查新日期不能为空， 请选择', trigger: 'blur' }],
   noveltyWay: [{ required: true, message: '查新途径不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -532,7 +532,7 @@
     novelty.value.labCode = userInfo.bizLabCode
     novelty.value.groupCode = userInfo.groupNo
     console.log(userInfo.username, 'userInfo')
-    if(userInfo.username === 'admin') {
+    if (userInfo.username === 'admin') {
       isAdmin.value = true
       return
     }
@@ -557,45 +557,45 @@
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
-          file: element.file
+          file: element.file,
           // 有更新1  无更新2
         })
       })
     })
   }
 }
-const isMonunted= ref(true)
-watch([() =>novelty.value.groupCode,() =>novelty.value.labCode],() => {
-  if(!isAdmin.value || isMonunted.value) {
+const isMonunted = ref(true)
+watch([() => novelty.value.groupCode, () => novelty.value.labCode], () => {
+  if (!isAdmin.value || isMonunted.value) {
     return
   }
-  if(!novelty.value.groupCode || !novelty.value.groupCode) {
-     return
+  if (!novelty.value.groupCode || !novelty.value.groupCode) {
+    return
   }
   // 填充查新纪录
   novelty.value.logList = []
   getFileMethodList({
-      offset: 1,
-      limit: 9999,
-    }).then((res) => {
-      // console.log(res.data, '123')
-      const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
-      data.forEach((element: any) => {
-        novelty.value.logList.push({
-          id: '',
-          fileId: element.id,
-          fileNo: element.fileNo,
-          fileName: element.fileName,
-          noveltyResult: element.noveltyStatus ? '1' : '2',
-          groupCode: element.groupCode,
-          groupCodeName: element.groupCodeName,
-          labCodeName: element.labCodeName,
-          labCode: element.labCode,
-          file: element.file
-          // 有更新1  无更新2
-        })
+    offset: 1,
+    limit: 9999,
+  }).then((res) => {
+    // console.log(res.data, '123')
+    const data = res.data.rows.filter((item: any) => item.groupCode === novelty.value.groupCode && (item.labCode === 'A' || item.labCode === novelty.value.labCode))
+    data.forEach((element: any) => {
+      novelty.value.logList.push({
+        id: '',
+        fileId: element.id,
+        fileNo: element.fileNo,
+        fileName: element.fileName,
+        noveltyResult: element.noveltyStatus ? '1' : '2',
+        groupCode: element.groupCode,
+        groupCodeName: element.groupCodeName,
+        labCodeName: element.labCodeName,
+        labCode: element.labCode,
+        file: element.file,
+        // 有更新1  无更新2
       })
     })
+  })
 })
 const initDialog = (params: any) => {
   // 从路由中获取参数
diff --git a/src/views/resource/file/recallArchive/archive-interface.ts b/src/views/resource/file/recallArchive/archive-interface.ts
index 9de0ccb..3f73ddc 100644
--- a/src/views/resource/file/recallArchive/archive-interface.ts
+++ b/src/views/resource/file/recallArchive/archive-interface.ts
@@ -9,7 +9,7 @@
   fileType: string //		文件类别(字典code)
   formId: string //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: string //		登记表编号
-  groupCode: string //		组别(字典code)
+  groupCode: string //		部门(字典code)
   labCode: string //		实验室(字典code)
   offset: number
   limit: number
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 4d8e29c..f82d7cd 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -40,7 +40,7 @@
   fileType: '', //		文件类别(字典code)
   formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
   formNo: '', //		登记表编号
-  groupCode: '', //		组别(字典code)
+  groupCode: '', //		部门(字典code)
   labCode: '', //		实验室(字典code)
   offset: 1,
   limit: 20,
@@ -217,7 +217,7 @@
     fileType: '', //		文件类别(字典code)
     formId: flowFormId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
     formNo: '', //		登记表编号
-    groupCode: '', //		组别(字典code)
+    groupCode: '', //		部门(字典code)
     labCode: '', //		实验室(字典code)
     offset: 1,
     limit: 20,
@@ -311,7 +311,7 @@
       fileType: searchQuery.value.fileType, //		文件类别(字典code)
       formId: searchQuery.value.formId, //		表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
       formNo: searchQuery.value.formNo, //		登记表编号
-      groupCode: searchQuery.value.groupCode, //		组别(字典code)
+      groupCode: searchQuery.value.groupCode, //		部门(字典code)
       labCode: searchQuery.value.labCode, //		实验室(字典code)
       offset: 1,
       limit: 20,
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index a354aee..0950cc1 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -68,7 +68,7 @@
 
 const applyRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   applyReason: [{ required: true, message: '申请原因不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
@@ -591,8 +591,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableApply.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableApply.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/applyList.vue b/src/views/resource/outsideService/consumable/applyList.vue
index 9f140c3..393bd7f 100644
--- a/src/views/resource/outsideService/consumable/applyList.vue
+++ b/src/views/resource/outsideService/consumable/applyList.vue
@@ -456,12 +456,13 @@
       >
         <el-table-column type="expand" width="1">
           <el-table
-            v-loading="expandLoading" :show-header="false" :data="goodsListExpand"
+            v-loading="expandLoading" :show-header="true" :data="goodsListExpand"
             border :class="active === '0' ? 'expand-approval-all' : 'expand-approval-with-status'"
           >
             <el-table-column label="名称" prop="goodsName" align="center" />
             <el-table-column label="规格型号" prop="goodsModel" align="center" />
             <el-table-column label="数量" prop="goodsQuantity" align="center" />
+            <el-table-column label="生产商" prop="supplierName" align="center" />
           </el-table>
         </el-table-column>
 
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
index 3f17d8d..bbc7a1b 100644
--- a/src/views/resource/outsideService/consumable/checkDetail.vue
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -63,7 +63,7 @@
 
 const checkRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   acceptTime: [{ required: true, message: '验收时间不能为空，请选择', trigger: 'blur' }],
   goodsApplyNo: [{ required: true, message: '易耗物资申请单不能为空，请选择', trigger: 'blur' }],
   goodsName: [{ required: true, message: '物资名称不能为空', trigger: 'blur' }],
@@ -547,8 +547,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="goodsCheckForm.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/evaluateDetail.vue b/src/views/resource/outsideService/consumable/evaluateDetail.vue
index 13bd1fa..871a267 100644
--- a/src/views/resource/outsideService/consumable/evaluateDetail.vue
+++ b/src/views/resource/outsideService/consumable/evaluateDetail.vue
@@ -66,7 +66,7 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -585,8 +585,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index aa4d5bb..8b11794 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -51,7 +51,7 @@
 
 const handoverRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 字典值
@@ -318,8 +318,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/storeDetail.vue b/src/views/resource/outsideService/consumable/storeDetail.vue
index 64f2d5c..62bde9b 100644
--- a/src/views/resource/outsideService/consumable/storeDetail.vue
+++ b/src/views/resource/outsideService/consumable/storeDetail.vue
@@ -68,7 +68,7 @@
 
 const storeRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -584,8 +584,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="consumableStore.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="consumableStore.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/consumable/useDetail.vue b/src/views/resource/outsideService/consumable/useDetail.vue
index f44e4c9..a1e083b 100644
--- a/src/views/resource/outsideService/consumable/useDetail.vue
+++ b/src/views/resource/outsideService/consumable/useDetail.vue
@@ -64,7 +64,7 @@
 
 const useRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 // 是否显示相关按钮
@@ -558,8 +558,8 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="组别" prop="groupCode">
-                <el-select v-model="consumableUse.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+              <el-form-item label="部门" prop="groupCode">
+                <el-select v-model="consumableUse.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                   <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/resource/outsideService/equipment/evaluateDetail.vue b/src/views/resource/outsideService/equipment/evaluateDetail.vue
index 0176a97..27a3c96 100644
--- a/src/views/resource/outsideService/equipment/evaluateDetail.vue
+++ b/src/views/resource/outsideService/equipment/evaluateDetail.vue
@@ -74,14 +74,14 @@
 
 const evaluateRules = ref({
   labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
   approvalStatus: '0', // 审批状态 = 全部
   deptId: '', // 所属部门id
   labCode: '', // 实验室
-  groupCode: '', // 组别
+  groupCode: '', // 部门
   directorId: '', // 负责人id
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
@@ -200,7 +200,7 @@
 // 新增
 const addEditableRow = () => {
   if (!equipmentEvaluate.value.labCode || !equipmentEvaluate.value.groupCode) {
-    ElMessage.warning('请先选择实验室和组别')
+    ElMessage.warning('请先选择实验室和部门')
     return
   }
   equipmentFilterRef.value.showOrHideFilterDialog(true)
@@ -433,7 +433,7 @@
     return false
   }
   eqptQuery.value.labCode = equipmentEvaluate.value.labCode// 实验室
-  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 组别
+  eqptQuery.value.groupCode = equipmentEvaluate.value.groupCode// 部门
   getEquipmentList(eqptQuery.value).then((res) => {
     if (res.code === 200) {
       res.data.rows.forEach((row: IEquipmentForm) => {
@@ -586,8 +586,8 @@
       equipmentEvaluate.value.deptName = userInfo.deptName
       equipmentEvaluate.value.labCode = userInfo.bizLabCode // 实验室
       equipmentEvaluate.value.labCodeName = userInfo.labCodeName // 实验室
-      equipmentEvaluate.value.groupCode = userInfo.groupNo // 组别
-      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 组别
+      equipmentEvaluate.value.groupCode = userInfo.groupNo // 部门
+      equipmentEvaluate.value.groupCodeName = userInfo.groupName// 部门
       equipmentEvaluate.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
 
       keyFieldsDisable.value = false
@@ -628,7 +628,7 @@
   getEquipmentListByDept()
 }
 
-// 修改组别
+// 修改部门
 const changeGroup = (val: string) => {
   getEquipmentListByDept()
 }
@@ -710,8 +710,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="equipmentEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;" @change="changeGroup">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/service/evaluateDetail.vue b/src/views/resource/outsideService/service/evaluateDetail.vue
index 889c638..43fea31 100644
--- a/src/views/resource/outsideService/service/evaluateDetail.vue
+++ b/src/views/resource/outsideService/service/evaluateDetail.vue
@@ -68,7 +68,7 @@
 
 const serviceEvaluateRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
 
 const eqptQuery = ref<IListQuery>({
@@ -624,8 +624,8 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组别" prop="groupCode">
-              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择组别" :disabled="keyFieldsDisable" style="width: 100%;">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="serviceEvaluate.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
                 <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/resource/outsideService/supplier/basic.vue b/src/views/resource/outsideService/supplier/basic.vue
index 70f5a2c..852ea1c 100644
--- a/src/views/resource/outsideService/supplier/basic.vue
+++ b/src/views/resource/outsideService/supplier/basic.vue
@@ -114,7 +114,7 @@
 
         <!-- 第一行 第二列 -->
         <el-col :span="6">
-          <el-form-item label="组别">
+          <el-form-item label="部门">
             <el-input v-model="supplierInfo.groupCodeName" :disabled="true" />
           </el-form-item>
           <el-form-item label="供方简称">
diff --git a/src/views/resource/outsideService/supplier/basicForEdit.vue b/src/views/resource/outsideService/supplier/basicForEdit.vue
index 8646167..1e348ea 100644
--- a/src/views/resource/outsideService/supplier/basicForEdit.vue
+++ b/src/views/resource/outsideService/supplier/basicForEdit.vue
@@ -64,7 +64,7 @@
 
 const supplierBasicRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
-  groupCode: [{ required: true, message: '组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierName: [{ required: true, message: '供方名称不能为空', trigger: 'blur' }],
   supplierType: [{ required: true, message: '供方类型不能为空，请选择', trigger: ['change', 'blur'] }],
   supplierContent: [{ required: true, message: '服务和供应内容不能为空', trigger: 'blur' }],
@@ -308,8 +308,8 @@
 
       <!-- 第一行 第二列 -->
       <el-col :span="6">
-        <el-form-item label="组别" prop="groupCode">
-          <el-select v-model="supplierInfo.groupCode" placeholder="请选择组别" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
+        <el-form-item label="部门" prop="groupCode">
+          <el-select v-model="supplierInfo.groupCode" placeholder="请选择部门" tabindex="2" :disabled="keyFieldsDisable" style="width: 100%;">
             <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/resource/person/order/detail.vue b/src/views/resource/person/order/detail.vue
index c4442cf..66fd75b 100644
--- a/src/views/resource/person/order/detail.vue
+++ b/src/views/resource/person/order/detail.vue
@@ -487,7 +487,7 @@
       orderInfo.value.createUserName = userInfo.name
       orderInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
       orderInfo.value.labCode = userInfo.bizLabCode // 实验室
-      orderInfo.value.groupCode = userInfo.groupNo // 组别
+      orderInfo.value.groupCode = userInfo.groupNo // 部门
       keyFieldsDisable.value = false
 
       break
diff --git a/src/views/resource/person/train/detail.vue b/src/views/resource/person/train/detail.vue
index 1845c2d..b425910 100644
--- a/src/views/resource/person/train/detail.vue
+++ b/src/views/resource/person/train/detail.vue
@@ -16,7 +16,7 @@
 
 // 字典值
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
@@ -61,7 +61,7 @@
 
 const trainBasicRules = ref({
   trainSite: [{ required: true, message: '训练场地不能为空，请选择', trigger: ['change', 'blur'] }],
-  trainGroup: [{ required: true, message: '培训组别不能为空，请选择', trigger: ['change', 'blur'] }],
+  trainGroup: [{ required: true, message: '培训部门不能为空，请选择', trigger: ['change', 'blur'] }],
   trainContent: [{ required: true, message: '培训内容不能为空，请选择', trigger: ['change', 'blur'] }],
   trainWay: [{ required: true, message: '培训方式不能为空，请选择', trigger: ['change', 'blur'] }],
   dutyLeader: [{ required: true, message: '值班领导不能为空', trigger: 'blur' }],
@@ -302,7 +302,7 @@
   }
 })
 
-// 监听培训组别 显示中文
+// 监听培训部门 显示中文
 watch(() => trainInfo.value.trainGroupArray, (newVal) => {
   if (trainInfo.value.trainGroupArray === undefined) {
     return
@@ -396,12 +396,12 @@
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
-            <el-form-item label="培训组别" prop="trainGroup">
+            <el-form-item label="培训部门" prop="trainGroup">
               <el-select
                 v-if="type !== 'detail'"
                 v-model="trainInfo.trainGroupArray" style="width: 100%;"
                 multiple collapse-tags collapse-tags-tooltip
-                placeholder="培训组别，可多选" :disabled="type === 'detail'"
+                placeholder="培训部门，可多选" :disabled="type === 'detail'"
               >
                 <el-option v-for="site in trainGroupDict" :key="site.id" :value="site.value" :label="site.name" />
               </el-select>
diff --git a/src/views/resource/person/train/list.vue b/src/views/resource/person/train/list.vue
index 51962a4..2dc55fa 100644
--- a/src/views/resource/person/train/list.vue
+++ b/src/views/resource/person/train/list.vue
@@ -25,7 +25,7 @@
 const columns = ref<Array<TableColumn>>([
   { text: '登记表编号', value: 'trainNo', align: 'center', width: '160' },
   { text: '训练场地', value: 'trainSiteName', align: 'center', width: '100' },
-  { text: '训练组别', value: 'trainGroupName', align: 'center' },
+  { text: '训练部门', value: 'trainGroupName', align: 'center' },
   { text: '培训内容', value: 'trainText', align: 'center' },
   { text: '培训方式', value: 'trainWayName', align: 'center', width: '120' },
   { text: '值班领导', value: 'dutyLeader', align: 'center', width: '100' },
@@ -34,7 +34,7 @@
 const list = ref([]) // 表格数据
 
 const trainSiteDict = ref<Array<IDictType>>([]) // 训练地点 HK / XC
-const trainGroupDict = ref<Array<IDictType>>([]) // 培训组别
+const trainGroupDict = ref<Array<IDictType>>([]) // 培训部门
 const trainContentDict = ref<Array<IDictType>>([]) // 培训内容
 const trainWayDict = ref<Array<IDictType>>([]) // 培训方式
 
diff --git a/src/views/resource/system/historyDoc/detail.vue b/src/views/resource/system/historyDoc/detail.vue
index ece5e50..c4a6c0c 100644
--- a/src/views/resource/system/historyDoc/detail.vue
+++ b/src/views/resource/system/historyDoc/detail.vue
@@ -77,13 +77,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/historyDoc/historyDoc-interface.ts b/src/views/resource/system/historyDoc/historyDoc-interface.ts
index b3ca8c3..45cc4ee 100644
--- a/src/views/resource/system/historyDoc/historyDoc-interface.ts
+++ b/src/views/resource/system/historyDoc/historyDoc-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室
-  groupCode: string // 组别、部门
+  groupCode: string // 部门、部门
   fileType: string // 文件类别
   fileNo: string // 文件编号
   fileName: string // 文件名
diff --git a/src/views/resource/system/historyDoc/list.vue b/src/views/resource/system/historyDoc/list.vue
index 3073b24..918c4c7 100644
--- a/src/views/resource/system/historyDoc/list.vue
+++ b/src/views/resource/system/historyDoc/list.vue
@@ -25,7 +25,7 @@
 // 查询条件
 const searchQuery = ref<IListQuery>({
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   fileType: '', // 文件类别
   fileNo: '', // 文件编号
   fileName: '', // 文件名
@@ -140,7 +140,7 @@
 const reset = () => {
   searchQuery.value = {
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     fileType: '', // 文件类别
     fileNo: '', // 文件编号
     fileName: '', // 文件名
@@ -204,7 +204,7 @@
   if (sysFileList.value.length > 0) {
     const params = {
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       fileType: searchQuery.value.fileType, // 文件类别
       fileNo: searchQuery.value.fileNo, // 文件编号
       fileName: searchQuery.value.fileName, // 文件名
@@ -378,7 +378,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/detail.vue b/src/views/resource/system/sysDoc/detail.vue
index 8385a94..2f49a49 100644
--- a/src/views/resource/system/sysDoc/detail.vue
+++ b/src/views/resource/system/sysDoc/detail.vue
@@ -64,13 +64,13 @@
 // -------------------------------------字典--------------------------------------------------
 
 const labCodeList = ref<dictType[]>([]) // 实验室
-const groupCodeList = ref<dictType[]>([]) // 组别
+const groupCodeList = ref<dictType[]>([]) // 部门
 function getDict() {
   // 实验室
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     groupCodeList.value = response.data
   })
diff --git a/src/views/resource/system/sysDoc/list.vue b/src/views/resource/system/sysDoc/list.vue
index 85dbf87..0966a3c 100644
--- a/src/views/resource/system/sysDoc/list.vue
+++ b/src/views/resource/system/sysDoc/list.vue
@@ -24,7 +24,7 @@
   fileType: '', // 文件类别
   history: '0', // 体系文件
   labCode: '', // 实验室
-  groupCode: '', // 组别、部门
+  groupCode: '', // 部门、部门
   effectiveDateStart: '', // 实施时间开始
   effectiveDateEnd: '', // 实施时间结束
   promulgateTimeEnd: '', // 颁布时间开始
@@ -132,7 +132,7 @@
     fileType: '', // 文件类别
     history: '0', // 体系文件
     labCode: '', // 实验室
-    groupCode: '', // 组别、部门
+    groupCode: '', // 部门、部门
     effectiveDateStart: '', // 实施时间开始
     effectiveDateEnd: '', // 实施时间结束
     promulgateTimeEnd: '', // 颁布时间开始
@@ -166,7 +166,7 @@
       fileType: searchQuery.value.fileType, // 文件类别
       history: '0', // 体系文件
       labCode: searchQuery.value.labCode, // 实验室
-      groupCode: searchQuery.value.groupCode, // 组别、部门
+      groupCode: searchQuery.value.groupCode, // 部门、部门
       effectiveDateStart: searchQuery.value.effectiveDateStart, // 实施时间开始
       effectiveDateEnd: searchQuery.value.effectiveDateEnd, // 实施时间结束
       promulgateTimeEnd: searchQuery.value.promulgateTimeEnd, // 颁布时间开始
@@ -343,7 +343,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/system/sysDoc/sysDoc-interface.ts b/src/views/resource/system/sysDoc/sysDoc-interface.ts
index 676859c..95662bc 100644
--- a/src/views/resource/system/sysDoc/sysDoc-interface.ts
+++ b/src/views/resource/system/sysDoc/sysDoc-interface.ts
@@ -10,7 +10,7 @@
   sort?: string
   order?: string
   labCode?: string // 实验室
-  groupCode?: string // 组别、部门
+  groupCode?: string // 部门、部门
   effectiveDateStart: string // 实施时间开始
   effectiveDateEnd: string // 实施时间结束
   promulgateTimeEnd: string // 颁布时间开始
diff --git a/src/views/resource/technology/method/method-interface.ts b/src/views/resource/technology/method/method-interface.ts
index 3442454..a99178d 100644
--- a/src/views/resource/technology/method/method-interface.ts
+++ b/src/views/resource/technology/method/method-interface.ts
@@ -1,7 +1,7 @@
 // 列表查询参数接口
 export interface IListQuery {
   labCode: string // 实验室编号
-  groupCode: string // 组别编号（部门）
+  groupCode: string // 部门编号（部门）
   fileNo: string // 文件编号
   fileName: string // 文件名
   fileDistributeNo: string // 文件发放号
diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue
index aed4b1b..41be211 100644
--- a/src/views/workbench/approve/list.vue
+++ b/src/views/workbench/approve/list.vue
@@ -14,7 +14,7 @@
 const messageSourceModuleList = ref<dictType[]>([]) // 来源模块
 const messageSourceModuleDict = ref({}) as any // 来源模块map
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const user = useUserStore() // 用户信息
@@ -199,14 +199,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
       }
       else { // 其他组
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index 814c8e7..29e56b9 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -11,7 +11,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const list = ref([]) as any // 表格数据
@@ -25,11 +25,11 @@
 const checkRecordTotalQuarter = ref('-') // 核查记录总数(本季度)
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -67,7 +67,7 @@
 const fetchCheckData = () => {
   getCheckData({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -105,7 +105,7 @@
     equipmentManufactureNo: '', // 被核查设备出厂编号
     recordNo: '', // 核查记录
     labCode: labCode.value, // 实验室
-    groupCode: groupCode.value, // 组别
+    groupCode: groupCode.value, // 部门
     limit: 999999,
     offset: 1,
   }).then((response) => {
@@ -121,7 +121,7 @@
 }
 
 // ----------------------------------------------钩子------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -143,14 +143,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -172,8 +172,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/eqptManage.vue b/src/views/workbench/components/eqptManage.vue
index b3958a7..dadc6db 100644
--- a/src/views/workbench/components/eqptManage.vue
+++ b/src/views/workbench/components/eqptManage.vue
@@ -10,7 +10,7 @@
 const $router = useRouter()
 const loading = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const showEmpty = ref(false)
 const emptyDisc = ref('') // 描述文字
@@ -51,14 +51,14 @@
 ])
 const current = ref('') // 选择的tab 默认基本信息
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 /**
  * 获取字典
  */
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -98,7 +98,7 @@
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   offset: 1,
   limit: 99999999,
@@ -155,7 +155,7 @@
   traceDateEnd: '', //	测试、校准或检定日期结束
   restrictionInstruction: '', // 限用说明
   conclusion: '', // 结论
-  groupCode: '', // 实验室组别
+  groupCode: '', // 实验室部门
   labCode: '', // 实验室
   glStaff: '0', // 是否为综合管理组人员1/0
   offset: 1,
@@ -181,7 +181,7 @@
   })
 }
 // --------------------------------------------钩子-------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -237,14 +237,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -267,8 +267,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/equipmentManage.vue b/src/views/workbench/components/equipmentManage.vue
index f317dfc..8dd70c8 100644
--- a/src/views/workbench/components/equipmentManage.vue
+++ b/src/views/workbench/components/equipmentManage.vue
@@ -10,7 +10,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 
@@ -37,14 +37,14 @@
 const equipmentSourceAnalysisXData = ref([]) as any // x轴
 const equipmentSourceAnalysisData = ref([]) as any
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 /**
  * 获取字典
  */
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -76,7 +76,7 @@
 const fetchEquipmentStatus = () => {
   getEquipmentStatus({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -95,7 +95,7 @@
 const fetchEquipmentType = () => {
   getEquipmentType({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -115,7 +115,7 @@
 const fetchEquipmentTrace = () => {
   getEquipmentTrace({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -132,7 +132,7 @@
 const fetchExpireTrend = () => {
   getExpireTrend({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -164,7 +164,7 @@
 const fetchEquipmentCount = () => {
   getEquipmentCount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -185,7 +185,7 @@
   fetchEquipmentCount()
 }
 // --------------------------------------------钩子-------------------------------------------------
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -206,14 +206,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -235,8 +235,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 筛选框和设备总数 -->
diff --git a/src/views/workbench/components/measureManage.vue b/src/views/workbench/components/measureManage.vue
index 6e74e8d..fa17ce3 100644
--- a/src/views/workbench/components/measureManage.vue
+++ b/src/views/workbench/components/measureManage.vue
@@ -11,7 +11,7 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 
@@ -26,11 +26,11 @@
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -62,7 +62,7 @@
   // 设备类型分析
   getMeasureDevice({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -86,7 +86,7 @@
 const fetchMeasureConclusion = (startDate = '', endDate = '') => {
   getMeasureConclusion({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -109,7 +109,7 @@
 const fetchertAmount = () => {
   getCertAmount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	组别编号（当是管理组人员时，为下拉选择的组别）
+    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
     labCode: labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
@@ -150,7 +150,7 @@
     fetchMeasureConclusion()
   }
 })
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -170,14 +170,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -199,8 +199,8 @@
     <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 综合管理组才可以筛选组别 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+    <!-- 综合管理组才可以筛选部门 -->
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/noveltySearch.vue b/src/views/workbench/components/noveltySearch.vue
index ed96617..b1d8821 100644
--- a/src/views/workbench/components/noveltySearch.vue
+++ b/src/views/workbench/components/noveltySearch.vue
@@ -6,7 +6,7 @@
 import useUserStore from '@/store/modules/user'
 const user = useUserStore() // 用户信息
 const isAdministrator = ref('0') // 是不是超级管理员
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 const methodList = ref<any[]>([]) // 实验室
 const loading = ref(true)
@@ -41,7 +41,7 @@
   fetchData()
 })
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -118,9 +118,9 @@
     >
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
-    <!-- 组别 -->
+    <!-- 部门 -->
     <el-select
-      v-model="query.groupCode" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="组别"
+      v-model="query.groupCode" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="部门"
       clearable @change="fetchData"
     >
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
diff --git a/src/views/workbench/components/step.vue b/src/views/workbench/components/step.vue
index 87ef585..45a0c54 100644
--- a/src/views/workbench/components/step.vue
+++ b/src/views/workbench/components/step.vue
@@ -14,18 +14,18 @@
 const loading = ref(false)
 const showEmpty = ref(false)
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 // 内部审核进度
 const scheduleList = ref([]) as any
 
 // ------------------------------------------字典----------------------------------------------
-const groupCodeList = ref([]) as any // 组别
+const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
 
 function getDict() {
-  // 组别
+  // 部门
   getDictByCode('bizGroupCode').then((response) => {
     const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
     tempMenu.forEach((item) => {
@@ -160,7 +160,7 @@
   fetchRegistrationList()
 }
 
-// 改变实验室\组别
+// 改变实验室\部门
 const changeSelect = () => {
   if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
     fetchData()
@@ -180,14 +180,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
         // 综合管理组可以查看待分发
       }
@@ -225,8 +225,8 @@
         >
           <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
-        <!-- 综合管理组才可以筛选组别 -->
-        <!-- <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="组别" clearable @change="changeSelect">
+        <!-- 综合管理组才可以筛选部门 -->
+        <!-- <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
         <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select> -->
       </div>
diff --git a/src/views/workbench/components/tableList.vue b/src/views/workbench/components/tableList.vue
index 9a383b3..99ef2d7 100644
--- a/src/views/workbench/components/tableList.vue
+++ b/src/views/workbench/components/tableList.vue
@@ -14,7 +14,7 @@
   },
 })
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('暂无数据') // 描述文字
 const user = useUserStore() // 用户信息
@@ -106,8 +106,8 @@
     else { // 不聚合直接跳详情
       updateWorkStatus(row) // 标记：未读 -> 已读
       const name = row.messageTopic
-      if (name === '周维护提醒' || name === '月保养提醒' || name === '标准装置核查提醒' ||
-        name.includes('周维护') || name.includes('月保养')
+      if (name === '周维护提醒' || name === '月保养提醒' || name === '标准装置核查提醒'
+        || name.includes('周维护') || name.includes('月保养')
       ) {
         $router.push({
           path: `${WORKPATHS[name]}`,
@@ -161,14 +161,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
       }
       else { // 其他组
diff --git a/src/views/workbench/work/workList.vue b/src/views/workbench/work/workList.vue
index d9c1d8a..3580708 100644
--- a/src/views/workbench/work/workList.vue
+++ b/src/views/workbench/work/workList.vue
@@ -12,7 +12,7 @@
 const $router = useRouter()
 const messageSourceModuleList = ref<dictType[]>([]) // 来源模块
 const labCode = ref('') // 实验室
-const groupCode = ref('') as any // 组别
+const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
 const emptyDisc = ref('') // 描述文字
 const user = useUserStore() // 用户信息
@@ -126,8 +126,8 @@
       },
     })
   }
-  else if (name === '周维护提醒' || name === '月保养提醒' || name === '标准装置核查提醒' ||
-    name.includes('周维护') || name.includes('月保养')
+  else if (name === '周维护提醒' || name === '月保养提醒' || name === '标准装置核查提醒'
+    || name.includes('周维护') || name.includes('月保养')
   ) {
     $router.push({
       path: `${WORKPATHS[name]}`,
@@ -212,14 +212,14 @@
       showEmpty.value = true
     }
     else if (!user.groupNo) { // 有实验室但没有组
-      emptyDisc.value = '此用户非超级管理员且无组别，无权限查看'
+      emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
       showEmpty.value = true
     }
     else { // 有实验室且有组
       showEmpty.value = false
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
-        // 综合管理组默认查实验室下面的所有数据，不筛选组别
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
         groupCode.value = ''
       }
       else { // 其他组